Merge pull request #207 from GriffinRichards/sync-script

Sync scripts with pokeemerald

asm/cable_club.s

@@ -446,18 +446,18 @@ sub_8080A4C: @ 8080A4C
 	bne _08080AB0
 	movs r0, 0x15
 	bl PlaySE
-	ldr r0, _08080AA8 @ =gUnknown_81BC4CE
+	ldr r0, _08080AA8 @ =CableClub_Text_WhenAllPlayersReadyAConfirmBCancel
 	bl ShowFieldAutoScrollMessage
 	ldr r0, _08080AAC @ =sub_8080AD0
 	b _08080ABE
 	.align 2, 0
 _08080AA4: .4byte gTasks
-_08080AA8: .4byte gUnknown_81BC4CE
+_08080AA8: .4byte CableClub_Text_WhenAllPlayersReadyAConfirmBCancel
 _08080AAC: .4byte sub_8080AD0
 _08080AB0:
 	movs r0, 0x16
 	bl PlaySE
-	ldr r0, _08080AC8 @ =gUnknown_81BC54C
+	ldr r0, _08080AC8 @ =CableClub_Text_AwaitingLinkupBCancel
 	bl ShowFieldAutoScrollMessage
 	ldr r0, _08080ACC @ =sub_8080CDC
 _08080ABE:
@@ -467,7 +467,7 @@ _08080AC0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08080AC8: .4byte gUnknown_81BC54C
+_08080AC8: .4byte CableClub_Text_AwaitingLinkupBCancel
 _08080ACC: .4byte sub_8080CDC
 	thumb_func_end sub_8080A4C
 
@@ -564,7 +564,7 @@ sub_8080B20: @ 8080B20
 	movs r2, 0
 	movs r3, 0x1
 	bl ConvertIntToDecimalStringN
-	ldr r0, _08080BC0 @ =gUnknown_81BC50D
+	ldr r0, _08080BC0 @ =CableClub_Text_StartLinkWithXPlayersAConfirmBCancel
 	bl ShowFieldAutoScrollMessage
 	mov r0, r9
 	subs r0, 0x8
@@ -582,7 +582,7 @@ _08080BA8:
 _08080BB4: .4byte gTasks+0x8
 _08080BB8: .4byte gMain
 _08080BBC: .4byte gStringVar1
-_08080BC0: .4byte gUnknown_81BC50D
+_08080BC0: .4byte CableClub_Text_StartLinkWithXPlayersAConfirmBCancel
 _08080BC4: .4byte sub_8080BC8
 	thumb_func_end sub_8080B20
 
@@ -622,7 +622,7 @@ sub_8080BC8: @ 8080BC8
 	cmp r0, 0
 	beq _08080C3C
 _08080C16:
-	ldr r0, _08080C30 @ =gUnknown_81BC4CE
+	ldr r0, _08080C30 @ =CableClub_Text_WhenAllPlayersReadyAConfirmBCancel
 	bl ShowFieldAutoScrollMessage
 	ldr r1, _08080C34 @ =gTasks
 	lsls r0, r5, 2
@@ -634,7 +634,7 @@ _08080C16:
 	b _08080C5C
 	.align 2, 0
 _08080C2C: .4byte gMain
-_08080C30: .4byte gUnknown_81BC4CE
+_08080C30: .4byte CableClub_Text_WhenAllPlayersReadyAConfirmBCancel
 _08080C34: .4byte gTasks
 _08080C38: .4byte sub_8080AD0
 _08080C3C:
@@ -1148,8 +1148,8 @@ _0808105A:
 _08081060: .4byte sub_8080FF0
 	thumb_func_end sub_808102C
 
-	thumb_func_start sub_8081064
+	thumb_func_start TryBattleLinkup
-sub_8081064: @ 8081064
+TryBattleLinkup: @ 8081064
 	push {r4,lr}
 	movs r3, 0x2
 	movs r2, 0x2
@@ -1202,10 +1202,10 @@ _080810B4:
 	.align 2, 0
 _080810C4: .4byte gLinkType
 _080810C8: .4byte 0x00002255
-	thumb_func_end sub_8081064
+	thumb_func_end TryBattleLinkup
 
-	thumb_func_start sub_80810CC
+	thumb_func_start TryTradeLinkup
-sub_80810CC: @ 80810CC
+TryTradeLinkup: @ 80810CC
 	push {lr}
 	ldr r1, _080810E8 @ =gLinkType
 	ldr r2, _080810EC @ =0x00001133
@@ -1223,7 +1223,7 @@ sub_80810CC: @ 80810CC
 _080810E8: .4byte gLinkType
 _080810EC: .4byte 0x00001133
 _080810F0: .4byte gBattleTypeFlags
-	thumb_func_end sub_80810CC
+	thumb_func_end TryTradeLinkup
 
 	thumb_func_start sub_80810F4
 sub_80810F4: @ 80810F4
@@ -2012,8 +2012,8 @@ _0808173C: .4byte c2_8056854
 _08081740: .4byte CB2_SetUpSaveAfterLinkBattle
 	thumb_func_end sub_8081668
 
-	thumb_func_start sub_8081744
+	thumb_func_start CleanupLinkRoomState
-sub_8081744: @ 8081744
+CleanupLinkRoomState: @ 8081744
 	push {lr}
 	ldr r0, _0808176C @ =gSpecialVar_0x8004
 	ldrh r1, [r0]
@@ -2034,7 +2034,7 @@ _08081760:
 	bx r0
 	.align 2, 0
 _0808176C: .4byte gSpecialVar_0x8004
-	thumb_func_end sub_8081744
+	thumb_func_end CleanupLinkRoomState
 
 	thumb_func_start sub_8081770
 sub_8081770: @ 8081770
@@ -2072,13 +2072,13 @@ _080817A4:
 	beq _0808180C
 	b _08081820
 _080817AE:
-	ldr r0, _080817BC @ =gUnknown_81BC4AC
+	ldr r0, _080817BC @ =CableClub_Text_PleaseWaitBCancel
 	bl ShowFieldMessage
 	movs r0, 0x1
 	strh r0, [r5, 0x8]
 	b _08081820
 	.align 2, 0
-_080817BC: .4byte gUnknown_81BC4AC
+_080817BC: .4byte CableClub_Text_PleaseWaitBCancel
 _080817C0:
 	bl IsFieldMessageBoxHidden
 	lsls r0, 24
@@ -2296,8 +2296,8 @@ _08081970:
 	bx r0
 	thumb_func_end sub_80818E8
 
-	thumb_func_start sub_8081978
+	thumb_func_start EnterTradeSeat
-sub_8081978: @ 8081978
+EnterTradeSeat: @ 8081978
 	push {lr}
 	ldr r0, _0808198C @ =gWirelessCommType
 	ldrb r0, [r0]
@@ -2317,7 +2317,7 @@ _0808199A:
 	bx r0
 	.align 2, 0
 _080819A0: .4byte sub_8081850
-	thumb_func_end sub_8081978
+	thumb_func_end EnterTradeSeat
 
 	thumb_func_start sub_80819A4
 sub_80819A4: @ 80819A4
@@ -2340,8 +2340,8 @@ sub_80819B8: @ 80819B8
 	bx r0
 	thumb_func_end sub_80819B8
 
-	thumb_func_start sub_80819C8
+	thumb_func_start EnterColosseumPlayerSpot
-sub_80819C8: @ 80819C8
+EnterColosseumPlayerSpot: @ 80819C8
 	push {lr}
 	ldr r1, _080819E4 @ =gLinkType
 	ldr r2, _080819E8 @ =0x00002211
@@ -2367,7 +2367,7 @@ _080819FA:
 	bx r0
 	.align 2, 0
 _08081A00: .4byte sub_8081318
-	thumb_func_end sub_80819C8
+	thumb_func_end EnterColosseumPlayerSpot
 
 	thumb_func_start sub_8081A04
 sub_8081A04: @ 8081A04
@@ -2382,8 +2382,8 @@ sub_8081A04: @ 8081A04
 _08081A18: .4byte sub_808177C
 	thumb_func_end sub_8081A04
 
-	thumb_func_start sp02A_crash_sound
+	thumb_func_start Script_ShowLinkTrainerCard
-sp02A_crash_sound: @ 8081A1C
+Script_ShowLinkTrainerCard: @ 8081A1C
 	push {lr}
 	ldr r0, _08081A2C @ =gSpecialVar_0x8006
 	ldrb r0, [r0]
@@ -2394,7 +2394,7 @@ sp02A_crash_sound: @ 8081A1C
 	.align 2, 0
 _08081A2C: .4byte gSpecialVar_0x8006
 _08081A30: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
-	thumb_func_end sp02A_crash_sound
+	thumb_func_end Script_ShowLinkTrainerCard
 
 	thumb_func_start sub_8081A34
 sub_8081A34: @ 8081A34

asm/dodrio_berry_picking.s

@@ -6306,8 +6306,8 @@ sub_81537AC: @ 81537AC
 _081537BC: .4byte gUnknown_203F3E0
 	thumb_func_end sub_81537AC
 
-	thumb_func_start sub_81537C0
+	thumb_func_start IsDodrioInParty
-sub_81537C0: @ 81537C0
+IsDodrioInParty: @ 81537C0
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, _081537F0 @ =gSpecialVar_Result
@@ -6346,10 +6346,10 @@ _08153804:
 	bx r0
 	.align 2, 0
 _0815380C: .4byte gSpecialVar_Result
-	thumb_func_end sub_81537C0
+	thumb_func_end IsDodrioInParty
 
-	thumb_func_start sub_8153810
+	thumb_func_start ShowDodrioBerryPickingRecords
-sub_8153810: @ 8153810
+ShowDodrioBerryPickingRecords: @ 8153810
 	push {r4,lr}
 	ldr r4, _0815382C @ =sub_8153830
 	adds r0, r4, 0
@@ -6363,7 +6363,7 @@ sub_8153810: @ 8153810
 	bx r0
 	.align 2, 0
 _0815382C: .4byte sub_8153830
-	thumb_func_end sub_8153810
+	thumb_func_end ShowDodrioBerryPickingRecords
 
 	thumb_func_start sub_8153830
 sub_8153830: @ 8153830

asm/field_control_avatar.s

@@ -801,7 +801,7 @@ _0806CEB8:
 	ldr r0, _0806CED8 @ =gUnknown_8168CE4
 	cmp r4, r0
 	beq _0806CECA
-	ldr r0, _0806CEDC @ =gUnknown_81A6955
+	ldr r0, _0806CEDC @ =EventScript_PC
 	cmp r4, r0
 	beq _0806CECA
 	movs r0, 0x5
@@ -816,7 +816,7 @@ _0806CED2:
 	bx r1
 	.align 2, 0
 _0806CED8: .4byte gUnknown_8168CE4
-_0806CEDC: .4byte gUnknown_81A6955
+_0806CEDC: .4byte EventScript_PC
 	thumb_func_end sub_806CEA0
 
 	thumb_func_start TryGetScriptOnPressingA
@@ -1180,14 +1180,14 @@ _0806D17A:
 	beq _0806D164
 	ldr r0, _0806D1D0 @ =gSpecialVar_Facing
 	strh r6, [r0]
-	ldr r0, _0806D1D4 @ =EventScript_PickUpHiddenItem
+	ldr r0, _0806D1D4 @ =EventScript_FoundHiddenItem
 	b _0806D1E6
 	.align 2, 0
 _0806D1C4: .4byte gSpecialVar_0x8005
 _0806D1C8: .4byte gSpecialVar_0x8004
 _0806D1CC: .4byte gSpecialVar_0x8006
 _0806D1D0: .4byte gSpecialVar_Facing
-_0806D1D4: .4byte EventScript_PickUpHiddenItem
+_0806D1D4: .4byte EventScript_FoundHiddenItem
 _0806D1D8:
 	cmp r2, 0xFF
 	beq _0806D1E0
@@ -1219,11 +1219,11 @@ sub_806D1F0: @ 806D1F0
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D218
-	ldr r0, _0806D214 @ =gUnknown_81A6955
+	ldr r0, _0806D214 @ =EventScript_PC
 	b _0806D53E
 	.align 2, 0
 _0806D210: .4byte gSpecialVar_Facing
-_0806D214: .4byte gUnknown_81A6955
+_0806D214: .4byte EventScript_PC
 _0806D218:
 	adds r0, r4, 0
 	bl MetatileBehavior_IsRegionMap
@@ -1231,10 +1231,10 @@ _0806D218:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D230
-	ldr r0, _0806D22C @ =gUnknown_81A6C32
+	ldr r0, _0806D22C @ =EventScript_WallTownMap
 	b _0806D53E
 	.align 2, 0
-_0806D22C: .4byte gUnknown_81A6C32
+_0806D22C: .4byte EventScript_WallTownMap
 _0806D230:
 	adds r0, r4, 0
 	bl MetatileBehavior_IsBookshelf
@@ -1519,10 +1519,10 @@ _0806D488:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D4A0
-	ldr r0, _0806D49C @ =gUnknown_81BBFD8
+	ldr r0, _0806D49C @ =CableClub_EventScript_81BBFD8
 	b _0806D53E
 	.align 2, 0
-_0806D49C: .4byte gUnknown_81BBFD8
+_0806D49C: .4byte CableClub_EventScript_81BBFD8
 _0806D4A0:
 	adds r0, r4, 0
 	bl MetatileBehavior_IsQuestionnaire
@@ -1542,10 +1542,10 @@ _0806D4B8:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D4D0
-	ldr r0, _0806D4CC @ =gUnknown_81BB8A7
+	ldr r0, _0806D4CC @ =CableClub_EventScript_ShowBattleRecords
 	b _0806D53E
 	.align 2, 0
-_0806D4CC: .4byte gUnknown_81BB8A7
+_0806D4CC: .4byte CableClub_EventScript_ShowBattleRecords
 _0806D4D0:
 	adds r0, r4, 0
 	bl MetatileBehavior_IsIndigoPlateauMark
@@ -1620,10 +1620,10 @@ sub_806D548: @ 806D548
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D570
-	ldr r0, _0806D56C @ =gUnknown_81A6B0D
+	ldr r0, _0806D56C @ =EventScript_CurrentTooFast
 	b _0806D5E2
 	.align 2, 0
-_0806D56C: .4byte gUnknown_81A6B0D
+_0806D56C: .4byte EventScript_CurrentTooFast
 _0806D570:
 	ldr r0, _0806D59C @ =0x00000824
 	bl FlagGet
@@ -1641,11 +1641,11 @@ _0806D570:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D5A4
-	ldr r0, _0806D5A0 @ =EventScript_1A6AC8
+	ldr r0, _0806D5A0 @ =EventScript_UseSurf
 	b _0806D5E2
 	.align 2, 0
 _0806D59C: .4byte 0x00000824
-_0806D5A0: .4byte EventScript_1A6AC8
+_0806D5A0: .4byte EventScript_UseSurf
 _0806D5A4:
 	adds r0, r4, 0
 	bl MetatileBehavior_IsWaterfall
@@ -1664,11 +1664,11 @@ _0806D5A4:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D5D8
-	ldr r0, _0806D5D4 @ =gUnknown_81BE2B7
+	ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall
 	b _0806D5E2
 	.align 2, 0
 _0806D5D0: .4byte 0x00000826
-_0806D5D4: .4byte gUnknown_81BE2B7
+_0806D5D4: .4byte EventScript_InteractWithWaterfall
 _0806D5D8:
 	ldr r0, _0806D5DC @ =EventScript_81BE2FF
 	b _0806D5E2

asm/fldeff_cut.s

@@ -189,13 +189,13 @@ sub_80979D0: @ 80979D0
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
-	ldr r0, _080979EC @ =gUnknown_81BDF6B
+	ldr r0, _080979EC @ =EventScript_FldEffCut
 	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080979E8: .4byte gFieldEffectArguments
-_080979EC: .4byte gUnknown_81BDF6B
+_080979EC: .4byte EventScript_FldEffCut
 	thumb_func_end sub_80979D0
 
 	thumb_func_start sub_80979F0

asm/fldeff_flash.s

@@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0
 	bl PlaySE
 	ldr r0, _080C9BC8 @ =0x00000806
 	bl FlagSet
-	ldr r0, _080C9BCC @ =EventScript_81BFB5F
+	ldr r0, _080C9BCC @ =EventScript_FldEffFlash
 	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080C9BC8: .4byte 0x00000806
-_080C9BCC: .4byte EventScript_81BFB5F
+_080C9BCC: .4byte EventScript_FldEffFlash
 	thumb_func_end sub_80C9BB0
 
 	thumb_func_start sub_80C9BD0

asm/link_rfu_3.s

@@ -210,8 +210,8 @@ _08115A1C: .4byte gStringVar4
 _08115A20: .4byte gUnknown_8457234
 	thumb_func_end sub_811599C
 
-	thumb_func_start sub_8115A24
+	thumb_func_start TryBecomeLinkLeader
-sub_8115A24: @ 8115A24
+TryBecomeLinkLeader: @ 8115A24
 	push {lr}
 	ldr r0, _08115A54 @ =sub_8115A68
 	movs r1, 0
@@ -240,7 +240,7 @@ _08115A58: .4byte gUnknown_203B05C
 _08115A5C: .4byte gTasks+0x8
 _08115A60: .4byte gUnknown_3002024
 _08115A64: .4byte gSpecialVar_Result
-	thumb_func_end sub_8115A24
+	thumb_func_end TryBecomeLinkLeader
 
 	thumb_func_start sub_8115A68
 sub_8115A68: @ 8115A68
@@ -1747,8 +1747,8 @@ _081166E4:
 	bx r1
 	thumb_func_end sub_81165E8
 
-	thumb_func_start BerryBlenderLinkJoinGroup
+	thumb_func_start TryJoinLinkGroup
-BerryBlenderLinkJoinGroup: @ 81166F4
+TryJoinLinkGroup: @ 81166F4
 	push {lr}
 	ldr r0, _08116724 @ =sub_8116738
 	movs r1, 0
@@ -1777,7 +1777,7 @@ _08116728: .4byte gUnknown_203B05C
 _0811672C: .4byte gTasks+0x8
 _08116730: .4byte gUnknown_3002028
 _08116734: .4byte gSpecialVar_Result
-	thumb_func_end BerryBlenderLinkJoinGroup
+	thumb_func_end TryJoinLinkGroup
 
 	thumb_func_start sub_8116738
 sub_8116738: @ 8116738
@@ -7556,8 +7556,8 @@ _08119996:
 	bx r1
 	thumb_func_end sub_8119944
 
-	thumb_func_start sub_811999C
+	thumb_func_start InitUnionRoom
-sub_811999C: @ 811999C
+InitUnionRoom: @ 811999C
 	push {r4-r6,lr}
 	ldr r5, _081199E8 @ =gUnknown_203B04C
 	movs r0, 0x1
@@ -7600,7 +7600,7 @@ _081199EC: .4byte gUnknown_203ADFA
 _081199F0: .4byte sub_81199FC
 _081199F4: .4byte gUnknown_203B05C
 _081199F8: .4byte gUnknown_300202C
-	thumb_func_end sub_811999C
+	thumb_func_end InitUnionRoom
 
 	thumb_func_start sub_81199FC
 sub_81199FC: @ 81199FC
@@ -7763,8 +7763,8 @@ _08119B5C:
 _08119B64: .4byte gUnknown_203B05C
 	thumb_func_end sub_81199FC
 
-	thumb_func_start sp182_move_string
+	thumb_func_start BufferUnionRoomPlayerName
-sp182_move_string: @ 8119B68
+BufferUnionRoomPlayerName: @ 8119B68
 	push {r4,lr}
 	ldr r4, _08119B78 @ =gUnknown_203B04C
 	ldrb r0, [r4]
@@ -7787,7 +7787,7 @@ _08119B8A:
 	bx r1
 	.align 2, 0
 _08119B90: .4byte gStringVar1
-	thumb_func_end sp182_move_string
+	thumb_func_end BufferUnionRoomPlayerName
 
 	thumb_func_start sub_8119B94
 sub_8119B94: @ 8119B94
@@ -10685,8 +10685,8 @@ sub_811B148: @ 811B148
 	bx lr
 	thumb_func_end sub_811B148
 
-	thumb_func_start sub_811B15C
+	thumb_func_start Script_ResetUnionRoomTrade
-sub_811B15C: @ 811B15C
+Script_ResetUnionRoomTrade: @ 811B15C
 	push {lr}
 	ldr r0, _0811B168 @ =gUnknown_203B06C
 	bl sub_811B148
@@ -10694,7 +10694,7 @@ sub_811B15C: @ 811B15C
 	bx r0
 	.align 2, 0
 _0811B168: .4byte gUnknown_203B06C
-	thumb_func_end sub_811B15C
+	thumb_func_end Script_ResetUnionRoomTrade
 
 	thumb_func_start sub_811B16C
 sub_811B16C: @ 811B16C

asm/macros/movement.inc

@@ -6,112 +6,112 @@
 	.endm
 
 	enum_start 0
-	create_movement step_00
+	create_movement face_down
-	create_movement step_01
+	create_movement face_up
-	create_movement step_02
+	create_movement face_left
-	create_movement step_03
+	create_movement face_right
-	create_movement slow_step_down
+	create_movement face_down_fast
-	create_movement slow_step_up
+	create_movement face_up_fast
-	create_movement slow_step_left
+	create_movement face_left_fast
-	create_movement slow_step_right
+	create_movement face_right_fast
-	create_movement step_down
+	create_movement walk_slowest_down
-	create_movement step_up
+	create_movement walk_slowest_up
-	create_movement step_left
+	create_movement walk_slowest_left
-	create_movement step_right
+	create_movement walk_slowest_right
-	create_movement fast_step_down
+	create_movement walk_slow_down
-	create_movement fast_step_up
+	create_movement walk_slow_up
-	create_movement fast_step_left
+	create_movement walk_slow_left
-	create_movement fast_step_right
+	create_movement walk_slow_right
-	create_movement step_10
+	create_movement walk_down
-	create_movement step_11
+	create_movement walk_up
-	create_movement step_12
+	create_movement walk_left
-	create_movement step_13
+	create_movement walk_right
-	create_movement step_14
+	create_movement jump_2_down
-	create_movement step_15
+	create_movement jump_2_up
-	create_movement step_16
+	create_movement jump_2_left
-	create_movement step_17
+	create_movement jump_2_right
-	create_movement step_18
+	create_movement delay_1
-	create_movement step_19
+	create_movement delay_2
-	create_movement step_1a
+	create_movement delay_4
-	create_movement step_1b
+	create_movement delay_8
-	create_movement step_1c
+	create_movement delay_16
-	create_movement step_1d
+	create_movement walk_fast_down
-	create_movement step_1e
+	create_movement walk_fast_up
-	create_movement step_1f
+	create_movement walk_fast_left
-	create_movement step_20
+	create_movement walk_fast_right
-	create_movement step_21
+	create_movement walk_in_place_slow_down
-	create_movement step_22
+	create_movement walk_in_place_slow_up
-	create_movement step_23
+	create_movement walk_in_place_slow_left
-	create_movement step_24
+	create_movement walk_in_place_slow_right
-	create_movement step_25
+	create_movement walk_in_place_down
-	create_movement step_26
+	create_movement walk_in_place_up
-	create_movement step_27
+	create_movement walk_in_place_left
-	create_movement step_28
+	create_movement walk_in_place_right
-	create_movement step_29
+	create_movement walk_in_place_fast_down
-	create_movement step_2a
+	create_movement walk_in_place_fast_up
-	create_movement step_2b
+	create_movement walk_in_place_fast_left
-	create_movement step_2c
+	create_movement walk_in_place_fast_right
-	create_movement step_2d
+	create_movement walk_in_place_fastest_down
-	create_movement step_2e
+	create_movement walk_in_place_fastest_up
-	create_movement step_2f
+	create_movement walk_in_place_fastest_left
-	create_movement step_30
+	create_movement walk_in_place_fastest_right
-	create_movement step_31
+	create_movement face_down_slow
-	create_movement step_32
+	create_movement face_up_slow
-	create_movement step_33
+	create_movement face_left_slow
-	create_movement step_34
+	create_movement face_right_slow
-	create_movement step_35
+	create_movement walk_fastest_down
-	create_movement step_36
+	create_movement walk_fastest_up
-	create_movement step_37
+	create_movement walk_fastest_left
-	create_movement step_38
+	create_movement walk_fastest_right
-	create_movement step_39
+	create_movement slide_down
-	create_movement step_3a
+	create_movement slide_up
-	create_movement step_3b
+	create_movement slide_left
-	create_movement step_3c
+	create_movement slide_right
-	create_movement step_3d
+	create_movement player_run_down
-	create_movement step_3e
+	create_movement player_run_up
-	create_movement step_3f
+	create_movement player_run_left
-	create_movement step_40
+	create_movement player_run_right
-	create_movement step_41
+	create_movement player_run_down_slow
-	create_movement step_42
+	create_movement player_run_up_slow
-	create_movement step_43
+	create_movement player_run_left_slow
-	create_movement step_44
+	create_movement player_run_right_slow
 	create_movement step_45
-	create_movement step_46
+	create_movement jump_down_run
-	create_movement step_47
+	create_movement jump_up_run
-	create_movement step_48
+	create_movement jump_left_run
-	create_movement step_49
+	create_movement jump_right_run
-	create_movement step_4a
+	create_movement face_player
-	create_movement step_4b
+	create_movement face_away_player
-	create_movement step_4c
+	create_movement lock_facing_direction
-	create_movement step_4d
+	create_movement unlock_facing_direction
-	create_movement step_4e
+	create_movement jump_down
-	create_movement step_4f
+	create_movement jump_up
-	create_movement step_50
+	create_movement jump_left
-	create_movement step_51
+	create_movement jump_right
-	create_movement step_52
+	create_movement jump_in_place_down
-	create_movement step_53
+	create_movement jump_in_place_up
-	create_movement step_54
+	create_movement jump_in_place_left
-	create_movement step_55
+	create_movement jump_in_place_right
-	create_movement step_56
+	create_movement jump_in_place_down_up
-	create_movement step_57
+	create_movement jump_in_place_up_down
-	create_movement step_58
+	create_movement jump_in_place_left_right
-	create_movement step_59
+	create_movement jump_in_place_right_left
-	create_movement step_5a
+	create_movement face_original_direction
-	create_movement step_5b
+	create_movement nurse_joy_bow
-	create_movement step_5c
+	create_movement enable_jump_landing_ground_effect
-	create_movement step_5d
+	create_movement disable_jump_landing_ground_effect
-	create_movement step_5e
+	create_movement disable_anim
-	create_movement step_5f
+	create_movement restore_anim
-	create_movement step_60
+	create_movement set_invisible
-	create_movement step_61
+	create_movement set_visible
-	create_movement step_62
+	create_movement emote_exclamation_mark
-	create_movement step_63
+	create_movement emote_question_mark
-	create_movement step_64
+	create_movement emote_x
-	create_movement step_65
+	create_movement emote_double_exclamation_mark
-	create_movement step_66
+	create_movement emote_smile
 	create_movement step_67
-	create_movement step_68
+	create_movement rock_smash_break
-	create_movement step_69
+	create_movement cut_tree
 
 	enum_start 0x91
 	create_movement step_91

asm/overworld.s

@@ -6453,7 +6453,7 @@ _08057E80:
 	bl sub_8057954
 	cmp r0, 0x1
 	bne _08057E96
-	ldr r0, _08057EA0 @ =gUnknown_81BB9FC
+	ldr r0, _08057EA0 @ =CableClub_EventScript_DoLinkRoomExit
 	bl ScriptContext1_SetupScript
 	ldr r0, _08057EA4 @ =sub_8057E6C
 	bl c1_link_related_func_set
@@ -6463,7 +6463,7 @@ _08057E96:
 	bx r1
 	.align 2, 0
 _08057E9C: .4byte gUnknown_3000E80
-_08057EA0: .4byte gUnknown_81BB9FC
+_08057EA0: .4byte CableClub_EventScript_DoLinkRoomExit
 _08057EA4: .4byte sub_8057E6C
 	thumb_func_end sub_8057E70
 
@@ -6798,7 +6798,7 @@ _08058074:
 	cmp r0, 0x80
 	beq _080580FC
 _080580E0:
-	ldr r0, _080580F8 @ =gUnknown_81BB9A3
+	ldr r0, _080580F8 @ =CableClub_EventScript_TooBusyToNotice
 	b _08058122
 	.align 2, 0
 _080580E4: .4byte gDirectionToVectors
@@ -6806,21 +6806,21 @@ _080580E8: .4byte 0xffff0000
 _080580EC: .4byte 0x0000ffff
 _080580F0: .4byte 0xffffff00
 _080580F4: .4byte gUnknown_3000E80
-_080580F8: .4byte gUnknown_81BB9A3
+_080580F8: .4byte CableClub_EventScript_TooBusyToNotice
 _080580FC:
 	adds r0, r2, 0
 	bl sub_8081A34
 	cmp r0, 0
 	bne _08058110
-	ldr r0, _0805810C @ =gUnknown_81BB981
+	ldr r0, _0805810C @ =CableClub_EventScript_ReadTrainerCard
 	b _08058122
 	.align 2, 0
-_0805810C: .4byte gUnknown_81BB981
+_0805810C: .4byte CableClub_EventScript_ReadTrainerCard
 _08058110:
-	ldr r0, _08058114 @ =gUnknown_81BB992
+	ldr r0, _08058114 @ =CableClub_EventScript_ReadTrainerCardColored
 	b _08058122
 	.align 2, 0
-_08058114: .4byte gUnknown_81BB992
+_08058114: .4byte CableClub_EventScript_ReadTrainerCardColored
 _08058118:
 	ldrb r1, [r4, 0xC]
 	ldrb r2, [r4, 0x3]
@@ -6837,62 +6837,62 @@ _08058122:
 sub_805812C: @ 805812C
 	push {lr}
 	adds r1, r0, 0
-	ldr r0, _08058178 @ =gUnknown_81BB8DB
+	ldr r0, _08058178 @ =BattleColosseum4P_EventScript_PlayerSpot0
 	cmp r1, r0
 	beq _08058172
-	ldr r0, _0805817C @ =gUnknown_81BB8F8
+	ldr r0, _0805817C @ =BattleColosseum4P_EventScript_PlayerSpot1
 	cmp r1, r0
 	beq _080581B4
-	ldr r0, _08058180 @ =gUnknown_81BB915
+	ldr r0, _08058180 @ =BattleColosseum4P_EventScript_PlayerSpot2
 	cmp r1, r0
 	beq _08058172
-	ldr r0, _08058184 @ =gUnknown_81BB932
+	ldr r0, _08058184 @ =BattleColosseum4P_EventScript_PlayerSpot3
 	cmp r1, r0
 	beq _080581B4
-	ldr r0, _08058188 @ =gUnknown_81BB980
+	ldr r0, _08058188 @ =RecordCenter_EventScript_Spot
 	cmp r1, r0
 	beq _08058172
-	ldr r0, _0805818C @ =gUnknown_81BB980
+	ldr r0, _0805818C @ =RecordCenter_EventScript_Spot
 	cmp r1, r0
 	beq _080581B4
-	ldr r0, _08058190 @ =gUnknown_81BB980
+	ldr r0, _08058190 @ =RecordCenter_EventScript_Spot
 	cmp r1, r0
 	beq _08058172
-	ldr r0, _08058194 @ =gUnknown_81BB980
+	ldr r0, _08058194 @ =RecordCenter_EventScript_Spot
 	cmp r1, r0
 	beq _080581B4
-	ldr r0, _08058198 @ =gUnknown_81BB8C3
+	ldr r0, _08058198 @ =BattleColosseum2P_EventScript_PlayerSpot0
 	cmp r1, r0
 	beq _08058172
-	ldr r0, _0805819C @ =gUnknown_81BB8CF
+	ldr r0, _0805819C @ =BattleColosseum2P_EventScript_PlayerSpot1
 	cmp r1, r0
 	beq _080581B4
-	ldr r0, _080581A0 @ =gUnknown_81BB950
+	ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0
 	cmp r1, r0
 	bne _080581A4
 _08058172:
 	movs r0, 0xA
 	b _080581B6
 	.align 2, 0
-_08058178: .4byte gUnknown_81BB8DB
+_08058178: .4byte BattleColosseum4P_EventScript_PlayerSpot0
-_0805817C: .4byte gUnknown_81BB8F8
+_0805817C: .4byte BattleColosseum4P_EventScript_PlayerSpot1
-_08058180: .4byte gUnknown_81BB915
+_08058180: .4byte BattleColosseum4P_EventScript_PlayerSpot2
-_08058184: .4byte gUnknown_81BB932
+_08058184: .4byte BattleColosseum4P_EventScript_PlayerSpot3
-_08058188: .4byte gUnknown_81BB980
+_08058188: .4byte RecordCenter_EventScript_Spot
-_0805818C: .4byte gUnknown_81BB980
+_0805818C: .4byte RecordCenter_EventScript_Spot
-_08058190: .4byte gUnknown_81BB980
+_08058190: .4byte RecordCenter_EventScript_Spot
-_08058194: .4byte gUnknown_81BB980
+_08058194: .4byte RecordCenter_EventScript_Spot
-_08058198: .4byte gUnknown_81BB8C3
+_08058198: .4byte BattleColosseum2P_EventScript_PlayerSpot0
-_0805819C: .4byte gUnknown_81BB8CF
+_0805819C: .4byte BattleColosseum2P_EventScript_PlayerSpot1
-_080581A0: .4byte gUnknown_81BB950
+_080581A0: .4byte TradeCenter_EventScript_Chair0
 _080581A4:
-	ldr r0, _080581B0 @ =gUnknown_81BB95C
+	ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1
 	cmp r1, r0
 	beq _080581B4
 	movs r0, 0
 	b _080581B6
 	.align 2, 0
-_080581B0: .4byte gUnknown_81BB95C
+_080581B0: .4byte TradeCenter_EventScript_Chair1
 _080581B4:
 	movs r0, 0x9
 _080581B6:
@@ -6938,13 +6938,13 @@ sub_80581F8: @ 80581F8
 	push {lr}
 	movs r0, 0x6
 	bl PlaySE
-	ldr r0, _08058210 @ =gUnknown_81BB9D4
+	ldr r0, _08058210 @ =TradeCenter_ConfirmLeaveRoom
 	bl ScriptContext1_SetupScript
 	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08058210: .4byte gUnknown_81BB9D4
+_08058210: .4byte TradeCenter_ConfirmLeaveRoom
 	thumb_func_end sub_80581F8
 
 	thumb_func_start sub_8058214
@@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214
 	thumb_func_start sub_8058230
 sub_8058230: @ 8058230
 	push {lr}
-	ldr r0, _08058240 @ =EventScript_1BB9F0
+	ldr r0, _08058240 @ =TradeCenter_TerminateLink
 	bl ScriptContext1_SetupScript
 	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08058240: .4byte EventScript_1BB9F0
+_08058240: .4byte TradeCenter_TerminateLink
 	thumb_func_end sub_8058230
 
 	thumb_func_start sub_8058244

asm/pokemon_jump_2.s

@@ -4244,8 +4244,8 @@ IsSpeciesAllowedInPokemonJump: @ 8149A00
 	bx r1
 	thumb_func_end IsSpeciesAllowedInPokemonJump
 
-	thumb_func_start sub_8149A18
+	thumb_func_start IsPokemonJumpSpeciesInParty
-sub_8149A18: @ 8149A18
+IsPokemonJumpSpeciesInParty: @ 8149A18
 	push {r4,r5,lr}
 	movs r5, 0
 _08149A1C:
@@ -4286,7 +4286,7 @@ _08149A5E:
 	bx r0
 	.align 2, 0
 _08149A68: .4byte gSpecialVar_Result
-	thumb_func_end sub_8149A18
+	thumb_func_end IsPokemonJumpSpeciesInParty
 
 	thumb_func_start sub_8149A6C
 sub_8149A6C: @ 8149A6C
@@ -7808,8 +7808,8 @@ _0814B4FC:
 _0814B500: .4byte 0x0000270e
 	thumb_func_end sub_814B4E8
 
-	thumb_func_start sub_814B504
+	thumb_func_start ShowPokemonJumpRecords
-sub_814B504: @ 814B504
+ShowPokemonJumpRecords: @ 814B504
 	push {r4,lr}
 	ldr r4, _0814B520 @ =sub_814B524
 	adds r0, r4, 0
@@ -7823,7 +7823,7 @@ sub_814B504: @ 814B504
 	bx r0
 	.align 2, 0
 _0814B520: .4byte sub_814B524
-	thumb_func_end sub_814B504
+	thumb_func_end ShowPokemonJumpRecords
 
 	thumb_func_start sub_814B524
 sub_814B524: @ 814B524

constants/misc_constants.inc

@@ -3,7 +3,6 @@
 
 	.set NULL, 0
 
-	.set POKEMON_NAME_LENGTH, 11
 	.set MOVE_NAME_LENGTH,    13
 
 	.set SPRITE_SIZE_8x8,   (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14)
@@ -24,14 +23,6 @@
 	.set OBJ_IMAGE_ANIM_H_FLIP, 1 << 6
 	.set OBJ_IMAGE_ANIM_V_FLIP, 1 << 7
 
-	.equiv DIR_SOUTH, 1
-	.equiv DIR_NORTH, 2
-	.equiv DIR_WEST,  3
-	.equiv DIR_EAST,  4
-
-	.equiv MALE, 0
-	.equiv FEMALE, 1
-
 	.ifdef ENGLISH
 	.equiv GAME_LANGUAGE, 2
 	.else

data/layouts/layouts.json

@@ -433,52 +433,52 @@
       "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_00_00",
+      "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
-      "name": "UnknownMap_00_00_Layout",
+      "name": "BattleColosseum2P_Layout",
       "width": 14,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnknownMap_00_00/border.bin",
+      "border_filepath": "data/layouts/BattleColosseum2P/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_00_00/map.bin"
+      "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_00_01",
+      "id": "LAYOUT_TRADE_CENTER",
-      "name": "UnknownMap_00_01_Layout",
+      "name": "TradeCenter_Layout",
       "width": 12,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnknownMap_00_01/border.bin",
+      "border_filepath": "data/layouts/TradeCenter/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_00_01/map.bin"
+      "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_00_02",
+      "id": "LAYOUT_RECORD_CENTER",
-      "name": "UnknownMap_00_02_Layout",
+      "name": "RecordCenter_Layout",
       "width": 20,
       "height": 10,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnknownMap_00_02/border.bin",
+      "border_filepath": "data/layouts/RecordCenter/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_00_02/map.bin"
+      "blockdata_filepath": "data/layouts/RecordCenter/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_00_03",
+      "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
-      "name": "UnknownMap_00_03_Layout",
+      "name": "BattleColosseum4P_Layout",
       "width": 14,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnknownMap_00_03/border.bin",
+      "border_filepath": "data/layouts/BattleColosseum4P/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_00_03/map.bin"
+      "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
     },
     {
       "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
@@ -2936,16 +2936,16 @@
       "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_00_04",
+      "id": "LAYOUT_UNION_ROOM",
-      "name": "UnknownMap_00_04_Layout",
+      "name": "UnionRoom_Layout",
       "width": 15,
       "height": 12,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D50DC",
-      "border_filepath": "data/layouts/UnknownMap_00_04/border.bin",
+      "border_filepath": "data/layouts/UnionRoom/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_00_04/map.bin"
+      "blockdata_filepath": "data/layouts/UnionRoom/map.bin"
     },
     {
       "id": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB",

data/map_events.s

@@ -1,9 +1,9 @@
 @#include "constants/bg_event_constants.h"
 @#include "constants/event_object_movement_constants.h"
-@#include "constants/event_objects.h"
+#include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
-@#include "constants/map_scripts.h"
+#include "constants/map_scripts.h"
 #include "constants/layouts.h"
 #include "constants/maps.h"
 @#include "constants/secret_bases.h"

data/maps/BattleColosseum2P/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_00_00",
+  "id": "MAP_BATTLE_COLOSSEUM_2P",
-  "name": "UnknownMap_00_00",
+  "name": "BattleColosseum2P",
-  "layout": "LAYOUT_UNKNOWN_MAP_00_00",
+  "layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
   "music": "MUS_POKECEN",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "UnknownMap_00_00_EventScript_1BB9AF",
+      "script": "BattleColosseum2P_EventScript_Attendant",
       "flag": "0"
     }
   ],
@@ -49,18 +49,18 @@
       "x": 3,
       "y": 5,
       "elevation": 3,
-      "var": "VAR_0x4000",
+      "var": "VAR_TEMP_0",
       "var_value": 0,
-      "script": "UnknownMap_00_00_EventScript_1BB8C3"
+      "script": "BattleColosseum2P_EventScript_PlayerSpot0"
     },
     {
       "type": "trigger",
       "x": 10,
       "y": 5,
       "elevation": 3,
-      "var": "VAR_0x4000",
+      "var": "VAR_TEMP_0",
       "var_value": 0,
-      "script": "UnknownMap_00_00_EventScript_1BB8CF"
+      "script": "BattleColosseum2P_EventScript_PlayerSpot1"
     }
   ],
   "bg_events": []

data/maps/BattleColosseum2P/scripts.inc

@@ -0,0 +1,2 @@
+BattleColosseum2P_MapScripts:: @ 8160478
+	.byte 0

data/maps/BattleColosseum4P/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_00_03",
+  "id": "MAP_BATTLE_COLOSSEUM_4P",
-  "name": "UnknownMap_00_03",
+  "name": "BattleColosseum4P",
-  "layout": "LAYOUT_UNKNOWN_MAP_00_03",
+  "layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
   "music": "MUS_POKECEN",
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
@@ -49,36 +49,36 @@
       "x": 3,
       "y": 4,
       "elevation": 3,
-      "var": "VAR_0x4000",
+      "var": "VAR_TEMP_0",
       "var_value": 0,
-      "script": "UnknownMap_00_03_EventScript_1BB8DB"
+      "script": "BattleColosseum4P_EventScript_PlayerSpot0"
     },
     {
       "type": "trigger",
       "x": 3,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_0x4000",
+      "var": "VAR_TEMP_0",
       "var_value": 0,
-      "script": "UnknownMap_00_03_EventScript_1BB915"
+      "script": "BattleColosseum4P_EventScript_PlayerSpot2"
     },
     {
       "type": "trigger",
       "x": 10,
       "y": 4,
       "elevation": 3,
-      "var": "VAR_0x4000",
+      "var": "VAR_TEMP_0",
       "var_value": 0,
-      "script": "UnknownMap_00_03_EventScript_1BB8F8"
+      "script": "BattleColosseum4P_EventScript_PlayerSpot1"
     },
     {
       "type": "trigger",
       "x": 10,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_0x4000",
+      "var": "VAR_TEMP_0",
       "var_value": 0,
-      "script": "UnknownMap_00_03_EventScript_1BB932"
+      "script": "BattleColosseum4P_EventScript_PlayerSpot3"
     }
   ],
   "bg_events": []

data/maps/BattleColosseum4P/scripts.inc

@@ -0,0 +1,2 @@
+BattleColosseum4P_MapScripts:: @ 816047B
+	.byte 0

data/maps/BirthIsland_Exterior/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BirthIsland_Exterior_EventScript_165271",
+      "script": "BirthIsland_Exterior_EventScript_Triangle",
       "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
     },
     {

data/maps/BirthIsland_Exterior/scripts.inc

@@ -1,77 +1,73 @@
 BirthIsland_Exterior_MapScripts:: @ 8165203
-	map_script 3, BirthIsland_Exterior_MapScript1_165217
+	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
-	map_script 5, BirthIsland_Exterior_MapScript2_165253
+	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
-	map_script 7, BirthIsland_Exterior_MapScript3_165213
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField
 	.byte 0
 
-BirthIsland_Exterior_MapScript3_165213:: @ 8165213
+BirthIsland_Exterior_OnReturnToField:: @ 8165213
 	special Special_SetDeoxysTriangleObjectPal
 	end
 
-BirthIsland_Exterior_MapScript1_165217:: @ 8165217
+BirthIsland_Exterior_OnTransition:: @ 8165217
 	setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
 	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N
 	setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
 	setvar VAR_DEOXYS_INTERACTION_NUM, 0
-	checkflag FLAG_FOUGHT_DEOXYS
+	call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle
-	call_if TRUE, EventScript_16523C
+	call_if_unset FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle
-	checkflag FLAG_FOUGHT_DEOXYS
-	call_if FALSE, EventScript_165243
 	end
 
-EventScript_16523C:: @ 816523C
+BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 816523C
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
 	return
 
-EventScript_165243:: @ 8165243
+BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8165243
-	checkflag FLAG_DEOXYS_FLEW_AWAY
+	goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_Return
-	goto_if TRUE, EventScript_1A77A9
 	clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
 	clearflag FLAG_SYS_DEOXYS_AWAKENED
 	return
 
-BirthIsland_Exterior_MapScript2_165253:: @ 8165253
+BirthIsland_Exterior_OnResume:: @ 8165253
-	checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
+	call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys
-	call_if TRUE, EventScript_16525D
 	end
 
-EventScript_16525D:: @ 816525D
+BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
 	specialvar VAR_RESULT, Special_GetBattleOutcome
-	compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
+	compare VAR_RESULT, B_OUTCOME_CAUGHT
-	goto_if ne, EventScript_1A77A9
+	goto_if_ne EventScript_Return
 	removeobject 2
 	return
 
-BirthIsland_Exterior_EventScript_165271:: @ 8165271
+BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
 	lock
 	faceplayer
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	special sub_8112364
-	special Special_DeoxysSound
+	special DoDeoxysRockInteraction
 	waitstate
 	switch VAR_RESULT
-	case 0, EventScript_1652BA
+	case 0, BirthIsland_Exterior_EventScript_NotSolved1
-	case 1, EventScript_1652BC
+	case 1, BirthIsland_Exterior_EventScript_NotSolved2
-	case 2, EventScript_1652C0
+	case 2, BirthIsland_Exterior_EventScript_Deoxys
-	case 3, EventScript_1652BE
+	case 3, BirthIsland_Exterior_EventScript_NotSolved3
 	end
 
-EventScript_1652BA:: @ 81652BA
+BirthIsland_Exterior_EventScript_NotSolved1:: @ 81652BA
 	release
 	end
 
-EventScript_1652BC:: @ 81652BC
+BirthIsland_Exterior_EventScript_NotSolved2:: @ 81652BC
 	release
 	end
 
-EventScript_1652BE:: @ 81652BE
+BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE
 	release
 	end
 
-EventScript_1652C0:: @ 81652C0
+BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
 	addobject 2
 	waitse
 	setfieldeffectarg 0, 1
@@ -80,7 +76,7 @@ EventScript_1652C0:: @ 81652C0
 	dofieldeffect 68
 	playbgm MUS_DEOEYE, 0
 	waitfieldeffect 68
-	applymovement 2, Movement_165353
+	applymovement 2, Movement_DeoxysApproach
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_DEOXYS, 2
@@ -88,41 +84,41 @@ EventScript_1652C0:: @ 81652C0
 	waitmoncry
 	setvar VAR_LAST_TALKED, 2
 	setvar VAR_0x8004, SPECIES_DEOXYS
-	setvar VAR_0x8005, 30
+	setvar VAR_0x8005, 30  @ Level
-	setvar VAR_0x8006, 0
+	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
-	compare_var_to_value VAR_RESULT, B_OUTCOME_WON
+	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if eq, EventScript_16533A
+	goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
-	compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
+	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if eq, EventScript_165348
+	goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
-	compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if eq, EventScript_165348
+	goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
 	setflag FLAG_FOUGHT_DEOXYS
 	release
 	end
 
-EventScript_16533A:: @ 816533A
+BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 816533A
 	setflag FLAG_DEOXYS_FLEW_AWAY
 	setvar VAR_0x8004, SPECIES_DEOXYS
-	goto EventScript_1A9236
+	goto EventScript_MonFlewAway
 	end
 
-EventScript_165348:: @ 8165348
+BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8165348
 	setvar VAR_0x8004, SPECIES_DEOXYS
-	goto EventScript_1A9236
+	goto EventScript_MonFlewAway
 	end
 
-Movement_165353:: @ 8165353
+Movement_DeoxysApproach: @ 8165353
-	step_down
+	walk_slowest_down
-	step_down
+	walk_slowest_down
-	step_down
+	walk_slowest_down
-	step_down
+	walk_slowest_down
-	step_down
+	walk_slowest_down
-	step_down
+	walk_slowest_down
-	step_down
+	walk_slowest_down
 	step_end

data/maps/BirthIsland_Harbor/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BirthIsland_Harbor_EventScript_1653E7",
+      "script": "BirthIsland_Harbor_EventScript_Sailor",
       "flag": "0"
     }
   ],

data/maps/BirthIsland_Harbor/scripts.inc

@@ -1,15 +1,15 @@
 BirthIsland_Harbor_MapScripts:: @ 81653E6
 	.byte 0
 
-BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
+BirthIsland_Harbor_EventScript_Sailor:: @ 81653E7
 	lock
 	faceplayer
-	message Text_181726
+	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
 	multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_1A91D5
+	case 0, EventScript_SailToVermilionCity
-	case 1, EventScript_1A90F6
+	case 1, EventScript_CancelSail
-	case 127, EventScript_1A90F6
+	case 127, EventScript_CancelSail
 	end

data/maps/CeladonCity/map.json

@@ -112,7 +112,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CBF",
+      "script": "CeladonCity_EventScript_SoftboiledTutor",
       "flag": "0"
     },
     {
@@ -203,7 +203,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_1BEBC0",
+      "script": "CeladonCity_EventScript_ItemEther",
       "flag": "FLAG_HIDE_CELADON_CITY_ETHER"
     },
     {

data/maps/CeladonCity/scripts.inc

@@ -1,13 +1,13 @@
 CeladonCity_MapScripts:: @ 8166C8F
-	map_script 3, CeladonCity_MapScript1_166C95
+	map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition
 	.byte 0
 
-CeladonCity_MapScript1_166C95:: @ 8166C95
+CeladonCity_OnTransition:: @ 8166C95
 	setworldmapflag FLAG_WORLD_MAP_CELADON_CITY
 	end
 
 CeladonCity_EventScript_166C99:: @ 8166C99
-	msgbox gUnknown_817FEC3, 2
+	msgbox gUnknown_817FEC3, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166CA2:: @ 8166CA2
@@ -17,15 +17,15 @@ CeladonCity_EventScript_166CA2:: @ 8166CA2
 	end
 
 CeladonCity_EventScript_166CAD:: @ 8166CAD
-	msgbox gUnknown_817FF4A, 2
+	msgbox gUnknown_817FF4A, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166CB6:: @ 8166CB6
-	msgbox gUnknown_817FFC5, 2
+	msgbox gUnknown_817FFC5, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166CBF:: @ 8166CBF
+CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF
-	goto EventScript_1C4A86
+	goto EventScript_SoftboiledTutor
 	end
 
 CeladonCity_EventScript_166CC5:: @ 8166CC5
@@ -33,7 +33,7 @@ CeladonCity_EventScript_166CC5:: @ 8166CC5
 	faceplayer
 	msgbox gUnknown_818001B
 	closemessage
-	applymovement 2, Movement_1A75E5
+	applymovement 2, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -46,33 +46,33 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC
 	msgbox gUnknown_8180075
 	closemessage
 	waitmoncry
-	applymovement 3, Movement_1A75E5
+	applymovement 3, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 CeladonCity_EventScript_166CFA:: @ 8166CFA
-	msgbox gUnknown_81800C2, 2
+	msgbox gUnknown_81800C2, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D03:: @ 8166D03
-	msgbox gUnknown_818008C, 2
+	msgbox gUnknown_818008C, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D0C:: @ 8166D0C
-	msgbox gUnknown_8180300, 2
+	msgbox gUnknown_8180300, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D15:: @ 8166D15
-	msgbox gUnknown_81804E1, 2
+	msgbox gUnknown_81804E1, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_166D1E:: @ 8166D1E
-	msgbox gUnknown_81800E1, 3
+	msgbox gUnknown_81800E1, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D27:: @ 8166D27
-	msgbox gUnknown_818017A, 3
+	msgbox gUnknown_818017A, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D30:: @ 8166D30
@@ -83,21 +83,21 @@ CeladonCity_EventScript_166D30:: @ 8166D30
 	end
 
 CeladonCity_EventScript_166D48:: @ 8166D48
-	msgbox gUnknown_81801E5, 3
+	msgbox gUnknown_81801E5, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D51:: @ 8166D51
-	msgbox gUnknown_81801F5, 3
+	msgbox gUnknown_81801F5, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D5A:: @ 8166D5A
-	msgbox gUnknown_8180224, 3
+	msgbox gUnknown_8180224, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D63:: @ 8166D63
-	msgbox gUnknown_81802A4, 3
+	msgbox gUnknown_81802A4, MSGBOX_SIGN
 	end
 
 CeladonCity_EventScript_166D6C:: @ 8166D6C
-	msgbox gUnknown_81802CF, 3
+	msgbox gUnknown_81802CF, MSGBOX_SIGN
 	end

data/maps/CeladonCity/text.inc

@@ -83,7 +83,7 @@ gUnknown_8180300:: @ 8180300
     .string "But it was boiling hot!\n"
     .string "Gotta cool it to drink it.$"
 
-Text_180388:: @ 8180388
+Text_SoftboiledTeach:: @ 8180388
     .string "Hello, there!\p"
     .string "I've seen you about, but I never\n"
     .string "had a chance to chat.\p"
@@ -92,16 +92,16 @@ Text_180388:: @ 8180388
     .string "I'd like to celebrate by teaching\n"
     .string "you the move SOFTBOILED.$"
 
-Text_18043F:: @ 818043F
+Text_SoftboiledDeclined:: @ 818043F
     .string "I'll always be keeping an eye out\n"
     .string "for you.\p"
     .string "I hope we can chat again.$"
 
-Text_180484:: @ 8180484
+Text_SoftboiledWhichMon:: @ 8180484
     .string "So, who's the POKéMON that gets\n"
     .string "the chance to learn SOFTBOILED?$"
 
-Text_1804C4:: @ 81804C4
+Text_SoftboiledTaught:: @ 81804C4
     .string "I wish you the best of luck!$"
 
 gUnknown_81804E1:: @ 81804E1

data/maps/CeladonCity_Condominiums_1F/scripts.inc

@@ -4,17 +4,14 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
 	lock
 	faceplayer
-	checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
+	goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A
-	goto_if TRUE, EventScript_16C36A
+	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374
-	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if_set FLAG_GOT_TEA, EventScript_16C36A
-	goto_if TRUE, EventScript_16C374
-	checkflag FLAG_GOT_TEA
-	goto_if TRUE, EventScript_16C36A
 	msgbox gUnknown_81960C9
 	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_1A6BF9
+	goto_if_eq EventScript_BagIsFull
 	msgbox gUnknown_8196109
 	release
 	end
@@ -62,5 +59,5 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4
 	end
 
 CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7
-	msgbox gUnknown_8196287, 3
+	msgbox gUnknown_8196287, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_2F/scripts.inc

@@ -2,5 +2,5 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0
 	.byte 0
 
 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1
-	msgbox gUnknown_81962A7, 3
+	msgbox gUnknown_81962A7, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_3F/scripts.inc

@@ -2,23 +2,23 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA
 	.byte 0
 
 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB
-	msgbox gUnknown_81962BF, 2
+	msgbox gUnknown_81962BF, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4
-	msgbox gUnknown_81962D7, 2
+	msgbox gUnknown_81962D7, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED
-	msgbox gUnknown_81962FB, 2
+	msgbox gUnknown_81962FB, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
 	lock
 	faceplayer
 	specialvar VAR_RESULT, HasAllKantoMons
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16C412
+	goto_if_eq EventScript_16C412
 	msgbox gUnknown_8196356
 	release
 	end
@@ -32,25 +32,25 @@ EventScript_16C418:: @ 816C418
 	waitmessage
 	delay 60
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	special Special_ShowDiploma
 	waitstate
 	release
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435
-	msgbox gUnknown_81964A8, 3
+	msgbox gUnknown_81964A8, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E
-	msgbox gUnknown_819640C, 3
+	msgbox gUnknown_819640C, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447
-	msgbox gUnknown_819644B, 3
+	msgbox gUnknown_819644B, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450
-	msgbox gUnknown_8196478, 3
+	msgbox gUnknown_8196478, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_Roof/scripts.inc

@@ -2,5 +2,5 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459
 	.byte 0
 
 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A
-	msgbox gUnknown_81964C4, 3
+	msgbox gUnknown_81964C4, MSGBOX_SIGN
 	end

data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc

@@ -2,20 +2,20 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463
 	.byte 0
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
-	msgbox gUnknown_81964D7, 2
+	msgbox gUnknown_81964D7, MSGBOX_NPC
 	end
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
 	lock
 	faceplayer
-	setvar VAR_0x4001, SPECIES_EEVEE
+	setvar VAR_TEMP_1, SPECIES_EEVEE
-	givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
+	givemon SPECIES_EEVEE, 25, ITEM_NONE
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16C4A6
+	goto_if_eq EventScript_16C4A6
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16C4DA
+	goto_if_eq EventScript_16C4DA
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A927C
+	goto_if_eq EventScript_1A927C
 	release
 	end
 
@@ -27,8 +27,8 @@ EventScript_16C4A6:: @ 816C4A6
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16C514
+	goto_if_eq EventScript_16C514
 	call EventScript_1A8C27
 	call EventScript_1A74EB
 	goto EventScript_16C514
@@ -42,8 +42,8 @@ EventScript_16C4DA:: @ 816C4DA
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16C509
+	goto_if_eq EventScript_16C509
 	call EventScript_1A8C33
 	goto EventScript_16C509
 	end
@@ -59,7 +59,7 @@ EventScript_16C514:: @ 816C514
 	end
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519
-	msgbox gUnknown_81967E3, 3
+	msgbox gUnknown_81967E3, MSGBOX_SIGN
 	end
 
 CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522

data/maps/CeladonCity_DepartmentStore_1F/scripts.inc

@@ -2,13 +2,13 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8
 	.byte 0
 
 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9
-	msgbox gUnknown_81954DD, 2
+	msgbox gUnknown_81954DD, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2
-	msgbox gUnknown_8195537, 3
+	msgbox gUnknown_8195537, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB
-	msgbox gUnknown_81955B3, 3
+	msgbox gUnknown_81955B3, MSGBOX_SIGN
 	end

data/maps/CeladonCity_DepartmentStore_2F/scripts.inc

@@ -2,27 +2,27 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4
 	.byte 0
 
 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5
-	msgbox gUnknown_81955C7, 2
+	msgbox gUnknown_81955C7, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE
-	msgbox gUnknown_819560F, 2
+	msgbox gUnknown_819560F, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
-	msgbox gUnknown_8195638, 3
+	msgbox gUnknown_8195638, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16BB38
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 
@@ -43,14 +43,14 @@ Items_16BB38:: @ 816BB38
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16BB74
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 

data/maps/CeladonCity_DepartmentStore_3F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_CounterTutor",
       "flag": "0"
     },
     {

data/maps/CeladonCity_DepartmentStore_3F/scripts.inc

@@ -1,50 +1,50 @@
 CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84
 	.byte 0
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85
+CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85
-	goto EventScript_1C4C26
+	goto EventScript_CounterTutor
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
-	msgbox gUnknown_81956E9, 2
+	msgbox gUnknown_81956E9, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94
-	msgbox gUnknown_8195769, 2
+	msgbox gUnknown_8195769, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D
-	msgbox gUnknown_81957B0, 2
+	msgbox gUnknown_81957B0, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6
-	msgbox gUnknown_8195823, 2
+	msgbox gUnknown_8195823, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF
-	msgbox gUnknown_8195863, 3
+	msgbox gUnknown_8195863, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8
-	msgbox gUnknown_8195875, 3
+	msgbox gUnknown_8195875, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1
-	msgbox gUnknown_8195897, 3
+	msgbox gUnknown_8195897, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA
-	msgbox gUnknown_81958B8, 3
+	msgbox gUnknown_81958B8, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3
-	msgbox gUnknown_81958D8, 3
+	msgbox gUnknown_81958D8, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC
-	msgbox gUnknown_81958F6, 3
+	msgbox gUnknown_81958F6, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5
-	msgbox gUnknown_8195907, 3
+	msgbox gUnknown_8195907, MSGBOX_SIGN
 	end

data/maps/CeladonCity_DepartmentStore_4F/scripts.inc

@@ -2,27 +2,27 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE
 	.byte 0
 
 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF
-	msgbox gUnknown_8195A68, 2
+	msgbox gUnknown_8195A68, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8
-	msgbox gUnknown_8195AC9, 2
+	msgbox gUnknown_8195AC9, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
-	msgbox gUnknown_8195B5B, 3
+	msgbox gUnknown_8195B5B, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16BC30
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 

data/maps/CeladonCity_DepartmentStore_4F/text.inc

@@ -1,4 +1,4 @@
-Text_195928:: @ 8195928
+Text_CounterTeach:: @ 8195928
     .string "Oh, hi!\n"
     .string "I finally finished POKéMON.\p"
     .string "Not done yet? How about I teach\n"
@@ -8,15 +8,15 @@ Text_195928:: @ 8195928
     .string "Not like the one I'm leaning on,\n"
     .string "mind you!$"
 
-Text_1959CC:: @ 81959CC
+Text_CounterDeclined:: @ 81959CC
     .string "You're not interested? Come see\n"
     .string "me if you change your mind.$"
 
-Text_195A08:: @ 8195A08
+Text_CounterWhichMon:: @ 8195A08
     .string "Which POKéMON should I teach\n"
     .string "COUNTER to?$"
 
-Text_195A31:: @ 8195A31
+Text_CounterTaught:: @ 8195A31
     .string "Are you using that COUNTER move\n"
     .string "I taught your POKéMON?$"
 

data/maps/CeladonCity_DepartmentStore_5F/scripts.inc

@@ -2,27 +2,27 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40
 	.byte 0
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41
-	msgbox gUnknown_8195BBA, 2
+	msgbox gUnknown_8195BBA, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A
-	msgbox gUnknown_8195CA0, 2
+	msgbox gUnknown_8195CA0, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
-	msgbox gUnknown_8195D14, 3
+	msgbox gUnknown_8195D14, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16BC84
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 
@@ -41,14 +41,14 @@ Items_16BC84:: @ 816BC84
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16BCBC
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 

data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc

@@ -4,11 +4,10 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
 	lockall
 	setvar VAR_0x8004, 3
-	checkflag FLAG_TEMP_2
+	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
-	call_if FALSE, EventScript_1A7AB9
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
-	message Text_1A535C
+	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, 3
 	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
@@ -61,8 +60,8 @@ 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_ELEVATOR_FLOOR, 4
+	compare VAR_ELEVATOR_FLOOR, 4
-	goto_if eq, EventScript_16C30E
+	goto_if_eq EventScript_16C30E
 	call EventScript_16C313
 	setvar VAR_ELEVATOR_FLOOR, 4
 	goto EventScript_16C30E
@@ -71,8 +70,8 @@ EventScript_16C246:: @ 816C246
 EventScript_16C26E:: @ 816C26E
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
-	compare_var_to_value VAR_ELEVATOR_FLOOR, 5
+	compare VAR_ELEVATOR_FLOOR, 5
-	goto_if eq, EventScript_16C30E
+	goto_if_eq EventScript_16C30E
 	call EventScript_16C313
 	setvar VAR_ELEVATOR_FLOOR, 5
 	goto EventScript_16C30E
@@ -81,8 +80,8 @@ EventScript_16C26E:: @ 816C26E
 EventScript_16C296:: @ 816C296
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
-	compare_var_to_value VAR_ELEVATOR_FLOOR, 6
+	compare VAR_ELEVATOR_FLOOR, 6
-	goto_if eq, EventScript_16C30E
+	goto_if_eq EventScript_16C30E
 	call EventScript_16C313
 	setvar VAR_ELEVATOR_FLOOR, 6
 	goto EventScript_16C30E
@@ -91,8 +90,8 @@ EventScript_16C296:: @ 816C296
 EventScript_16C2BE:: @ 816C2BE
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
-	compare_var_to_value VAR_ELEVATOR_FLOOR, 7
+	compare VAR_ELEVATOR_FLOOR, 7
-	goto_if eq, EventScript_16C30E
+	goto_if_eq EventScript_16C30E
 	call EventScript_16C313
 	setvar VAR_ELEVATOR_FLOOR, 7
 	goto EventScript_16C30E
@@ -101,8 +100,8 @@ EventScript_16C2BE:: @ 816C2BE
 EventScript_16C2E6:: @ 816C2E6
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
-	compare_var_to_value VAR_ELEVATOR_FLOOR, 8
+	compare VAR_ELEVATOR_FLOOR, 8
-	goto_if eq, EventScript_16C30E
+	goto_if_eq EventScript_16C30E
 	call EventScript_16C313
 	setvar VAR_ELEVATOR_FLOOR, 8
 	goto EventScript_16C30E

data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc

@@ -3,51 +3,51 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
 
 CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare 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
+	compare VAR_TEMP_1, 0
-	goto_if eq, EventScript_16C00E
+	goto_if_eq EventScript_16C00E
 	goto EventScript_16BD3E
 	end
 
 EventScript_16BCF6:: @ 816BCF6
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	checkitem ITEM_FRESH_WATER, 1
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	call_if eq, EventScript_16BD2C
+	call_if_eq EventScript_16BD2C
 	checkitem ITEM_SODA_POP, 1
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	call_if eq, EventScript_16BD32
+	call_if_eq EventScript_16BD32
 	checkitem ITEM_LEMONADE, 1
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	call_if eq, EventScript_16BD38
+	call_if_eq EventScript_16BD38
 	return
 
 EventScript_16BD2C:: @ 816BD2C
-	addvar VAR_0x4001, 1
+	addvar VAR_TEMP_1, 1
 	return
 
 EventScript_16BD32:: @ 816BD32
-	addvar VAR_0x4001, 2
+	addvar VAR_TEMP_1, 2
 	return
 
 EventScript_16BD38:: @ 816BD38
-	addvar VAR_0x4001, 4
+	addvar VAR_TEMP_1, 4
 	return
 
 EventScript_16BD3E:: @ 816BD3E
 	msgbox gUnknown_8195D22, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16C00C
+	goto_if_eq EventScript_16C00C
 	textcolor 3
 	message Text_195D5F
 	waitmessage
 	textcolor 1
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 1, EventScript_16BDAE
 	case 2, EventScript_16BDDA
 	case 3, EventScript_16BE06
@@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7
 EventScript_16BF19:: @ 816BF19
 	setvar VAR_0x8008, ITEM_FRESH_WATER
 	setvar VAR_0x8009, ITEM_TM16
-	checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
+	goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018
-	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195D75
 	goto EventScript_16BF7C
 	end
@@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19
 EventScript_16BF3A:: @ 816BF3A
 	setvar VAR_0x8008, ITEM_SODA_POP
 	setvar VAR_0x8009, ITEM_TM20
-	checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
+	goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018
-	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195E33
 	goto EventScript_16BF7C
 	end
@@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A
 EventScript_16BF5B:: @ 816BF5B
 	setvar VAR_0x8008, ITEM_LEMONADE
 	setvar VAR_0x8009, ITEM_TM33
-	checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
+	goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018
-	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195EBF
 	goto EventScript_16BF7C
 	end
@@ -150,22 +147,22 @@ EventScript_16BF7C:: @ 816BF7C
 	getitemname 1, VAR_0x8009
 	removeitem VAR_0x8008, 1
 	checkitemspace VAR_0x8009, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16C002
+	goto_if_eq EventScript_16C002
-	additem VAR_0x8009, 1
+	additem VAR_0x8009
 	textcolor 3
 	playfanfare MUS_FANFA1
-	message Text_195DAD
+	message Text_ReceivedItemFromLittleGirl
 	waitmessage
 	waitfanfare
-	giveitem VAR_0x8009, 1, 8
+	putitemaway VAR_0x8009
 	call EventScript_1A6675
-	compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER
+	compare VAR_0x8008, ITEM_FRESH_WATER
-	call_if eq, EventScript_16BFDE
+	call_if_eq EventScript_16BFDE
-	compare_var_to_value VAR_0x8008, ITEM_SODA_POP
+	compare VAR_0x8008, ITEM_SODA_POP
-	call_if eq, EventScript_16BFEA
+	call_if_eq EventScript_16BFEA
-	compare_var_to_value VAR_0x8008, ITEM_LEMONADE
+	compare VAR_0x8008, ITEM_LEMONADE
-	call_if eq, EventScript_16BFF6
+	call_if_eq EventScript_16BFF6
 	release
 	end
 
@@ -204,11 +201,11 @@ EventScript_16C018:: @ 816C018
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022
-	msgbox gUnknown_8195F98, 2
+	msgbox gUnknown_8195F98, MSGBOX_NPC
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B
-	msgbox gUnknown_8196017, 3
+	msgbox gUnknown_8196017, MSGBOX_SIGN
 	end
 
 CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
@@ -221,8 +218,8 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
 
 EventScript_16C045:: @ 816C045
 	multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE
-	copyvar VAR_0x4001, VAR_RESULT
+	copyvar VAR_TEMP_1, VAR_RESULT
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 0, EventScript_16C083
 	case 1, EventScript_16C094
 	case 2, EventScript_16C0A5
@@ -231,19 +228,19 @@ EventScript_16C045:: @ 816C045
 	end
 
 EventScript_16C083:: @ 816C083
-	setvar VAR_0x4000, ITEM_FRESH_WATER
+	setvar VAR_TEMP_0, ITEM_FRESH_WATER
 	checkmoney 200, 0
 	goto EventScript_16C0CB
 	end
 
 EventScript_16C094:: @ 816C094
-	setvar VAR_0x4000, ITEM_SODA_POP
+	setvar VAR_TEMP_0, ITEM_SODA_POP
 	checkmoney 300, 0
 	goto EventScript_16C0CB
 	end
 
 EventScript_16C0A5:: @ 816C0A5
-	setvar VAR_0x4000, ITEM_LEMONADE
+	setvar VAR_TEMP_0, ITEM_LEMONADE
 	checkmoney 350, 0
 	goto EventScript_16C0CB
 	end
@@ -261,22 +258,22 @@ EventScript_16C0C4:: @ 816C0C4
 	return
 
 EventScript_16C0CB:: @ 816C0CB
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16C131
+	goto_if_eq EventScript_16C131
-	checkitemspace VAR_0x4000, 1
+	checkitemspace VAR_TEMP_0, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16C13F
+	goto_if_eq EventScript_16C13F
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16C0B6
+	call_if_eq EventScript_16C0B6
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16C0BD
+	call_if_eq EventScript_16C0BD
-	compare_var_to_value VAR_0x4001, 2
+	compare VAR_TEMP_1, 2
-	call_if eq, EventScript_16C0C4
+	call_if_eq EventScript_16C0C4
 	updatemoneybox 0, 0, 0
-	getitemname 0, VAR_0x4000
+	getitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
 	msgbox gUnknown_8196076
-	additem VAR_0x4000, 1
+	additem VAR_TEMP_0
 	goto EventScript_16C125
 	end
 

data/maps/CeladonCity_DepartmentStore_Roof/text.inc

@@ -12,7 +12,7 @@ gUnknown_8195D75:: @ 8195D75
     .string "Thank you!\n"
     .string "You can have this from me!$"
 
-Text_195DAD:: @ 8195DAD
+Text_ReceivedItemFromLittleGirl:: @ 8195DAD
     .string "{PLAYER} received a {STR_VAR_2}\n"
     .string "from the little girl.$"
 

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -1,10 +1,9 @@
 CeladonCity_GameCorner_MapScripts:: @ 816C646
-	map_script 1, CeladonCity_GameCorner_MapScript1_16C64C
+	map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad
 	.byte 0
 
-CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C
+CeladonCity_GameCorner_OnLoad:: @ 816C64C
-	checkflag FLAG_OPENED_ROCKET_HIDEOUT
+	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656
-	call_if FALSE, EventScript_16C656
 	end
 
 EventScript_16C656:: @ 816C656
@@ -16,13 +15,13 @@ EventScript_16C656:: @ 816C656
 	return
 
 CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
-	msgbox gUnknown_8196940, 2
+	msgbox gUnknown_8196940, MSGBOX_NPC
 	end
 
 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
@@ -39,33 +38,32 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
 	end
 
 EventScript_16C6E6:: @ 816C6E6
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790
-	goto_if FALSE, EventScript_16C790
+	compare VAR_0x8009, 0
-	compare_var_to_value VAR_0x8009, 0
+	goto_if_eq EventScript_16C734
-	goto_if eq, EventScript_16C734
+	compare VAR_0x8009, 1
-	compare_var_to_value VAR_0x8009, 1
+	goto_if_eq EventScript_16C706
-	goto_if eq, EventScript_16C706
 	end
 
 EventScript_16C706:: @ 816C706
-	checkcoins VAR_0x4001
+	checkcoins VAR_TEMP_1
-	compare_var_to_value VAR_0x4001, 9500
+	compare VAR_TEMP_1, 9500
-	goto_if ge, EventScript_16C79E
+	goto_if_ge EventScript_16C79E
 	checkmoney 10000, 0
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16C7AC
+	goto_if_eq EventScript_16C7AC
 	givecoins 500
 	takemoney 10000, 0
 	goto EventScript_16C762
 	end
 
 EventScript_16C734:: @ 816C734
-	checkcoins VAR_0x4001
+	checkcoins VAR_TEMP_1
-	compare_var_to_value VAR_0x4001, 9950
+	compare VAR_TEMP_1, 9950
-	goto_if ge, EventScript_16C79E
+	goto_if_ge EventScript_16C79E
 	checkmoney 1000, 0
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16C7AC
+	goto_if_eq EventScript_16C7AC
 	givecoins 50
 	takemoney 1000, 0
 	goto EventScript_16C762
@@ -114,7 +112,7 @@ CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA
 
 EventScript_16C7CA:: @ 816C7CA
 	closemessage
-	applymovement VAR_LAST_TALKED, Movement_1A75E5
+	applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -129,14 +127,12 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
 	lock
 	faceplayer
-	checkflag FLAG_GOT_10_COINS_FROM_GAMBLER
+	goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849
-	goto_if TRUE, EventScript_16C849
 	msgbox gUnknown_8196AF3
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
-	goto_if FALSE, EventScript_16C839
+	checkcoins VAR_TEMP_1
-	checkcoins VAR_0x4001
+	compare VAR_TEMP_1, 9990
-	compare_var_to_value VAR_0x4001, 9990
+	goto_if_ge EventScript_16C82B
-	goto_if ge, EventScript_16C82B
 	givecoins 10
 	textcolor 3
 	msgbox gUnknown_8196B0D
@@ -165,8 +161,7 @@ EventScript_16C849:: @ 816C849
 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_ERIKA
+	goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870
-	goto_if TRUE, EventScript_16C870
 	msgbox gUnknown_8196BAD
 	goto EventScript_16C7CA
 	end
@@ -193,14 +188,12 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
 CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
 	lock
 	faceplayer
-	checkflag FLAG_GOT_20_COINS_FROM_GAMBLER
+	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0
-	goto_if TRUE, EventScript_16C8F0
 	msgbox gUnknown_8196D2B
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
-	goto_if FALSE, EventScript_16C839
+	checkcoins VAR_TEMP_1
-	checkcoins VAR_0x4001
+	compare VAR_TEMP_1, 9980
-	compare_var_to_value VAR_0x4001, 9980
+	goto_if_ge EventScript_16C8E2
-	goto_if ge, EventScript_16C8E2
 	givecoins 20
 	textcolor 3
 	msgbox gUnknown_8196D47
@@ -223,14 +216,12 @@ EventScript_16C8F0:: @ 816C8F0
 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
 	lock
 	faceplayer
-	checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
+	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950
-	goto_if TRUE, EventScript_16C950
 	msgbox gUnknown_8196DB7
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
-	goto_if FALSE, EventScript_16C839
+	checkcoins VAR_TEMP_1
-	checkcoins VAR_0x4001
+	compare VAR_TEMP_1, 9980
-	compare_var_to_value VAR_0x4001, 9980
+	goto_if_ge EventScript_16C942
-	goto_if ge, EventScript_16C942
 	givecoins 20
 	textcolor 3
 	msgbox gUnknown_8196DF8
@@ -261,11 +252,10 @@ EventScript_16C96A:: @ 816C96A
 	end
 
 EventScript_16C96C:: @ 816C96C
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0
-	goto_if FALSE, EventScript_16CAA0
 	msgbox gUnknown_8196F46, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16C96A
+	goto_if_eq EventScript_16C96A
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
 	setfieldeffectarg 2, 14
@@ -410,8 +400,7 @@ EventScript_16CAA0:: @ 816CAA0
 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
 	lockall
 	msgbox gUnknown_8196EDC
-	checkflag FLAG_OPENED_ROCKET_HIDEOUT
+	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE
-	call_if FALSE, EventScript_16CABE
 	releaseall
 	end
 
@@ -427,17 +416,17 @@ EventScript_16CABE:: @ 816CABE
 	return
 
 CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10
-	msgbox gUnknown_8196E9B, 6
+	msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16CB10:: @ 816CB10
 	msgbox gUnknown_8196E9B
 	closemessage
-	compare_var_to_value VAR_FACING, 3
+	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_16CB34
+	call_if_eq EventScript_16CB34
-	compare_var_to_value VAR_FACING, 3
+	compare VAR_FACING, DIR_WEST
-	call_if ne, EventScript_16CB3F
+	call_if_ne EventScript_16CB3F
 	removeobject 11
 	release
 	end
@@ -453,33 +442,33 @@ EventScript_16CB3F:: @ 816CB3F
 	return
 
 Movement_16CB4A:: @ 816CB4A
-	step_10
+	walk_down
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_11
+	walk_up
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
 	step_end
 
 Movement_16CB53:: @ 816CB53
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
 	step_end
 
 CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A
-	msgbox gUnknown_8196F64, 3
+	msgbox gUnknown_8196F64, MSGBOX_SIGN
 	end
 
 CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63
-	msgbox gUnknown_8196F81, 3
+	msgbox gUnknown_8196F81, MSGBOX_SIGN
 	end
 
 CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C
-	msgbox gUnknown_8196FA0, 3
+	msgbox gUnknown_8196FA0, MSGBOX_SIGN
 	end

data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc

@@ -2,21 +2,20 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75
 	.byte 0
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76
-	msgbox gUnknown_8196FC1, 2
+	msgbox gUnknown_8196FC1, MSGBOX_NPC
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
-	msgbox gUnknown_8196FFF, 2
+	msgbox gUnknown_8196FFF, MSGBOX_NPC
 	end
 
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
 	lock
 	faceplayer
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
-	goto_if FALSE, EventScript_16CD99
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CBB2
@@ -43,12 +42,12 @@ EventScript_16CC10:: @ 816CC10
 
 EventScript_16CC15:: @ 816CC15
 	.ifdef FIRERED
-	setvar VAR_0x4001, SPECIES_ABRA
+	setvar VAR_TEMP_1, SPECIES_ABRA
-	setvar VAR_0x4002, 180
+	setvar VAR_TEMP_2, 180
 	.else
 	.ifdef LEAFGREEN
-	setvar VAR_0x4001, SPECIES_ABRA
+	setvar VAR_TEMP_1, SPECIES_ABRA
-	setvar VAR_0x4002, 120
+	setvar VAR_TEMP_2, 120
 	.endif
 	.endif
 	goto EventScript_16CC65
@@ -56,12 +55,12 @@ EventScript_16CC15:: @ 816CC15
 
 EventScript_16CC25:: @ 816CC25
 	.ifdef FIRERED
-	setvar VAR_0x4001, SPECIES_CLEFAIRY
+	setvar VAR_TEMP_1, SPECIES_CLEFAIRY
-	setvar VAR_0x4002, 500
+	setvar VAR_TEMP_2, 500
 	.else
 	.ifdef LEAFGREEN
-	setvar VAR_0x4001, SPECIES_CLEFAIRY
+	setvar VAR_TEMP_1, SPECIES_CLEFAIRY
-	setvar VAR_0x4002, 750
+	setvar VAR_TEMP_2, 750
 	.endif
 	.endif
 	goto EventScript_16CC65
@@ -69,12 +68,12 @@ EventScript_16CC25:: @ 816CC25
 
 EventScript_16CC35:: @ 816CC35
 	.ifdef FIRERED
-	setvar VAR_0x4001, SPECIES_DRATINI
+	setvar VAR_TEMP_1, SPECIES_DRATINI
-	setvar VAR_0x4002, 2800
+	setvar VAR_TEMP_2, 2800
 	.else
 	.ifdef LEAFGREEN
-	setvar VAR_0x4001, SPECIES_PINSIR
+	setvar VAR_TEMP_1, SPECIES_PINSIR
-	setvar VAR_0x4002, 2500
+	setvar VAR_TEMP_2, 2500
 	.endif
 	.endif
 	goto EventScript_16CC65
@@ -82,12 +81,12 @@ EventScript_16CC35:: @ 816CC35
 
 EventScript_16CC45:: @ 816CC45
 	.ifdef FIRERED
-	setvar VAR_0x4001, SPECIES_SCYTHER
+	setvar VAR_TEMP_1, SPECIES_SCYTHER
-	setvar VAR_0x4002, 5500
+	setvar VAR_TEMP_2, 5500
 	.else
 	.ifdef LEAFGREEN
-	setvar VAR_0x4001, SPECIES_DRATINI
+	setvar VAR_TEMP_1, SPECIES_DRATINI
-	setvar VAR_0x4002, 4600
+	setvar VAR_TEMP_2, 4600
 	.endif
 	.endif
 	goto EventScript_16CC65
@@ -95,27 +94,27 @@ EventScript_16CC45:: @ 816CC45
 
 EventScript_16CC55:: @ 816CC55
 	.ifdef FIRERED
-	setvar VAR_0x4001, SPECIES_PORYGON
+	setvar VAR_TEMP_1, SPECIES_PORYGON
-	setvar VAR_0x4002, 9999
+	setvar VAR_TEMP_2, 9999
 	.else
 	.ifdef LEAFGREEN
-	setvar VAR_0x4001, SPECIES_PORYGON
+	setvar VAR_TEMP_1, SPECIES_PORYGON
-	setvar VAR_0x4002, 6500
+	setvar VAR_TEMP_2, 6500
 	.endif
 	.endif
 	goto EventScript_16CC65
 	end
 
 EventScript_16CC65:: @ 816CC65
-	getspeciesname 0, VAR_0x4001
+	getspeciesname 0, VAR_TEMP_1
 	msgbox gUnknown_819709D, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16CC10
+	goto_if_eq EventScript_16CC10
 	checkcoins VAR_RESULT
-	compare_var_to_var VAR_RESULT, VAR_0x4002
+	compare VAR_RESULT, VAR_TEMP_2
-	goto_if lt, EventScript_16CDA5
+	goto_if_lt EventScript_16CDA5
 	textcolor 3
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case SPECIES_ABRA, EventScript_16CCD4
 	case SPECIES_CLEFAIRY, EventScript_16CCE9
 	case SPECIES_DRATINI, EventScript_16CCFE
@@ -126,10 +125,10 @@ EventScript_16CC65:: @ 816CC65
 
 EventScript_16CCD4:: @ 816CCD4
 	.ifdef FIRERED
-	givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 9, ITEM_NONE
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_0x4001, 7, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 7, ITEM_NONE
 	.endif
 	.endif
 	goto EventScript_16CD52
@@ -137,10 +136,10 @@ EventScript_16CCD4:: @ 816CCD4
 
 EventScript_16CCE9:: @ 816CCE9
 	.ifdef FIRERED
-	givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 8, ITEM_NONE
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_0x4001, 12, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 12, ITEM_NONE
 	.endif
 	.endif
 	goto EventScript_16CD52
@@ -148,43 +147,43 @@ EventScript_16CCE9:: @ 816CCE9
 
 EventScript_16CCFE:: @ 816CCFE
 	.ifdef FIRERED
-	givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 18, ITEM_NONE
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_0x4001, 24, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 24, ITEM_NONE
 	.endif
 	.endif
 	goto EventScript_16CD52
 	end
 
 EventScript_16CD13:: @ 816CD13
-	givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 25, ITEM_NONE
 	goto EventScript_16CD52
 	end
 
 EventScript_16CD28:: @ 816CD28
 	.ifdef FIRERED
-	givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 26, ITEM_NONE
 	.else
 	.ifdef LEAFGREEN
-	givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 18, ITEM_NONE
 	.endif
 	.endif
 	goto EventScript_16CD52
 	end
 
 EventScript_16CD3D:: @ 816CD3D
-	givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0
+	givemon VAR_TEMP_1, 18, ITEM_NONE
 	goto EventScript_16CD52
 	end
 
 EventScript_16CD52:: @ 816CD52
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16CDB3
+	goto_if_eq EventScript_16CDB3
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16CDE0
+	goto_if_eq EventScript_16CDE0
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_16CD74
+	goto_if_eq EventScript_16CD74
 	end
 
 EventScript_16CD74:: @ 816CD74
@@ -195,7 +194,7 @@ EventScript_16CD74:: @ 816CD74
 	end
 
 EventScript_16CD83:: @ 816CD83
-	countpokemon
+	getpartysize
 	subvar VAR_RESULT, 1
 	copyvar VAR_0x8004, VAR_RESULT
 	call EventScript_1A74EB
@@ -214,30 +213,30 @@ EventScript_16CDA5:: @ 816CDA5
 	end
 
 EventScript_16CDB3:: @ 816CDB3
-	takecoins VAR_0x4002
+	takecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
-	getspeciesname 0, VAR_0x4001
+	getspeciesname 0, VAR_TEMP_1
 	playfanfare MUS_FANFA1
 	message Text_1A5DF1
 	waitmessage
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16CD83
+	goto_if_eq EventScript_16CD83
 	goto EventScript_16CC10
 	end
 
 EventScript_16CDE0:: @ 816CDE0
-	takecoins VAR_0x4002
+	takecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
-	getspeciesname 0, VAR_0x4001
+	getspeciesname 0, VAR_TEMP_1
 	playfanfare MUS_FANFA1
 	message Text_1A5DF1
 	waitmessage
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16CE12
+	goto_if_eq EventScript_16CE12
 	call EventScript_1A8C33
 	goto EventScript_16CE12
 	end
@@ -250,11 +249,10 @@ EventScript_16CE12:: @ 816CE12
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
 	lock
 	faceplayer
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
-	goto_if FALSE, EventScript_16CD99
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CE47
@@ -275,72 +273,72 @@ EventScript_16CE47:: @ 816CE47
 	end
 
 EventScript_16CEA5:: @ 816CEA5
-	setvar VAR_0x4001, ITEM_TM13
+	setvar VAR_TEMP_1, ITEM_TM13
-	setvar VAR_0x4002, 4000
+	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_ICE_BEAM
 	goto EventScript_16CF09
 	end
 
 EventScript_16CEB9:: @ 816CEB9
-	setvar VAR_0x4001, ITEM_TM23
+	setvar VAR_TEMP_1, ITEM_TM23
-	setvar VAR_0x4002, 3500
+	setvar VAR_TEMP_2, 3500
 	getmovename 1, MOVE_IRON_TAIL
 	goto EventScript_16CF09
 	end
 
 EventScript_16CECD:: @ 816CECD
-	setvar VAR_0x4001, ITEM_TM24
+	setvar VAR_TEMP_1, ITEM_TM24
-	setvar VAR_0x4002, 4000
+	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_THUNDERBOLT
 	goto EventScript_16CF09
 	end
 
 EventScript_16CEE1:: @ 816CEE1
-	setvar VAR_0x4001, ITEM_TM30
+	setvar VAR_TEMP_1, ITEM_TM30
-	setvar VAR_0x4002, 4500
+	setvar VAR_TEMP_2, 4500
 	getmovename 1, MOVE_SHADOW_BALL
 	goto EventScript_16CF09
 	end
 
 EventScript_16CEF5:: @ 816CEF5
-	setvar VAR_0x4001, ITEM_TM35
+	setvar VAR_TEMP_1, ITEM_TM35
-	setvar VAR_0x4002, 4000
+	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_FLAMETHROWER
 	goto EventScript_16CF09
 	end
 
 EventScript_16CF09:: @ 816CF09
 	msgbox gUnknown_81970B2, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16CC10
+	goto_if_eq EventScript_16CC10
 	goto EventScript_16CF3F
 	end
 
 EventScript_16CF22:: @ 816CF22
-	getitemname 0, VAR_0x4001
+	getitemname 0, VAR_TEMP_1
 	msgbox gUnknown_819709D, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16CC10
+	goto_if_eq EventScript_16CC10
 	goto EventScript_16CF3F
 	end
 
 EventScript_16CF3F:: @ 816CF3F
-	getitemname 0, VAR_0x4001
+	getitemname 0, VAR_TEMP_1
 	checkcoins VAR_RESULT
-	compare_var_to_var VAR_RESULT, VAR_0x4002
+	compare VAR_RESULT, VAR_TEMP_2
-	goto_if lt, EventScript_16CDA5
+	goto_if_lt EventScript_16CDA5
-	checkitemspace VAR_0x4001, 1
+	checkitemspace VAR_TEMP_1, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16CF79
+	goto_if_eq EventScript_16CF79
-	takecoins VAR_0x4002
+	takecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
-	giveitem VAR_0x4001
+	giveitem VAR_TEMP_1
 	goto EventScript_16CC10
 	end
 
 EventScript_16CF79:: @ 816CF79
 	textcolor 3
-	msgbox gUnknown_81A5242
+	msgbox Text_TooBadBagFull
 	hidecoinsbox 0, 0
 	release
 	end
@@ -348,11 +346,10 @@ EventScript_16CF79:: @ 816CF79
 CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
 	lock
 	faceplayer
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
-	goto_if FALSE, EventScript_16CD99
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CFB2
@@ -373,31 +370,31 @@ EventScript_16CFB2:: @ 816CFB2
 	end
 
 EventScript_16D010:: @ 816D010
-	setvar VAR_0x4001, ITEM_SMOKE_BALL
+	setvar VAR_TEMP_1, ITEM_SMOKE_BALL
-	setvar VAR_0x4002, 800
+	setvar VAR_TEMP_2, 800
 	goto EventScript_16CF22
 	end
 
 EventScript_16D020:: @ 816D020
-	setvar VAR_0x4001, ITEM_MIRACLE_SEED
+	setvar VAR_TEMP_1, ITEM_MIRACLE_SEED
-	setvar VAR_0x4002, 1000
+	setvar VAR_TEMP_2, 1000
 	goto EventScript_16CF22
 	end
 
 EventScript_16D030:: @ 816D030
-	setvar VAR_0x4001, ITEM_CHARCOAL
+	setvar VAR_TEMP_1, ITEM_CHARCOAL
-	setvar VAR_0x4002, 1000
+	setvar VAR_TEMP_2, 1000
 	goto EventScript_16CF22
 	end
 
 EventScript_16D040:: @ 816D040
-	setvar VAR_0x4001, ITEM_MYSTIC_WATER
+	setvar VAR_TEMP_1, ITEM_MYSTIC_WATER
-	setvar VAR_0x4002, 1000
+	setvar VAR_TEMP_2, 1000
 	goto EventScript_16CF22
 	end
 
 EventScript_16D050:: @ 816D050
-	setvar VAR_0x4001, ITEM_YELLOW_FLUTE
+	setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE
-	setvar VAR_0x4002, 1600
+	setvar VAR_TEMP_2, 1600
 	goto EventScript_16CF22
 	end

data/maps/CeladonCity_Gym/scripts.inc

@@ -3,9 +3,8 @@ CeladonCity_Gym_MapScripts:: @ 816D060
 
 CeladonCity_Gym_EventScript_16D061:: @ 816D061
 	famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
+	trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC
-	checkflag FLAG_GOT_TM19_FROM_ERIKA
+	goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6
-	goto_if FALSE, EventScript_16D0C6
 	famechecker FAMECHECKER_ERIKA, 4
 	msgbox gUnknown_81972B8
 	release
@@ -23,10 +22,9 @@ EventScript_16D0A0:: @ 816D0A0
 EventScript_16D0C6:: @ 816D0C6
 	msgbox gUnknown_8197327
 	checkitemspace ITEM_TM19, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16D107
+	goto_if_eq EventScript_16D107
-	additem ITEM_TM19, 1
+	giveitem_msg gUnknown_81973BA, ITEM_TM19
-	giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
 	setflag FLAG_GOT_TM19_FROM_ERIKA
 	msgbox gUnknown_81973D7
 	release
@@ -38,46 +36,45 @@ EventScript_16D107:: @ 816D107
 	end
 
 CeladonCity_Gym_EventScript_16D111:: @ 816D111
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4
+	trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4
-	msgbox gUnknown_81974D6, 6
+	msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D128:: @ 816D128
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
+	trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF
 	famechecker FAMECHECKER_ERIKA, 2
-	msgbox gUnknown_8197708, 6
+	msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB
+	trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB
-	msgbox gUnknown_81975D1, 6
+	msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D163:: @ 816D163
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C
+	trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C
-	msgbox gUnknown_8197527, 6
+	msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
+	trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660
 	famechecker FAMECHECKER_ERIKA, 3
-	msgbox gUnknown_8197664, 6
+	msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A
+	trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A
-	msgbox gUnknown_8197788, 6
+	msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832
+	trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832
-	msgbox gUnknown_819783E, 6
+	msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE
 	end
 
 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
 	lockall
-	checkflag FLAG_BADGE04_GET
+	goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0
-	goto_if TRUE, EventScript_16D1E0
 	msgbox gUnknown_8197874
 	releaseall
 	end

data/maps/CeladonCity_Hotel/scripts.inc

@@ -2,17 +2,17 @@ CeladonCity_Hotel_MapScripts:: @ 816D283
 	.byte 0
 
 CeladonCity_Hotel_EventScript_16D284:: @ 816D284
-	msgbox gUnknown_8197B77, 2
+	msgbox gUnknown_8197B77, MSGBOX_NPC
 	end
 
 CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D
-	msgbox gUnknown_8197BBE, 2
+	msgbox gUnknown_8197BBE, MSGBOX_NPC
 	end
 
 CeladonCity_Hotel_EventScript_16D296:: @ 816D296
-	msgbox gUnknown_8197C0C, 2
+	msgbox gUnknown_8197C0C, MSGBOX_NPC
 	end
 
 CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F
-	msgbox gUnknown_8197C30, 2
+	msgbox gUnknown_8197C30, MSGBOX_NPC
 	end

data/maps/CeladonCity_House1/scripts.inc

@@ -2,13 +2,13 @@ CeladonCity_House1_MapScripts:: @ 816D267
 	.byte 0
 
 CeladonCity_House1_EventScript_16D268:: @ 816D268
-	msgbox gUnknown_8197A9F, 2
+	msgbox gUnknown_8197A9F, MSGBOX_NPC
 	end
 
 CeladonCity_House1_EventScript_16D271:: @ 816D271
-	msgbox gUnknown_8197AD3, 2
+	msgbox gUnknown_8197AD3, MSGBOX_NPC
 	end
 
 CeladonCity_House1_EventScript_16D27A:: @ 816D27A
-	msgbox gUnknown_8197B20, 2
+	msgbox gUnknown_8197B20, MSGBOX_NPC
 	end

data/maps/CeladonCity_PokemonCenter_1F/scripts.inc

@@ -1,27 +1,27 @@
 CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC
-	map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7
+	map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition
-	map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7
+CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7
 	setrespawn SPAWN_CELADON_CITY
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
 	lock
 	faceplayer
-	call EventScript_1A6578
+	call EventScript_PkmnCenterNurse
 	release
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604
-	msgbox gUnknown_819685B, 2
+	msgbox gUnknown_819685B, MSGBOX_NPC
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D
-	msgbox gUnknown_81968C2, 2
+	msgbox gUnknown_81968C2, MSGBOX_NPC
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616
-	msgbox gUnknown_8196913, 2
+	msgbox gUnknown_8196913, MSGBOX_NPC
 	end

data/maps/CeladonCity_PokemonCenter_2F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_MG_DELIVERYMEN"
     }
   ],
@@ -78,14 +78,14 @@
       "x": 5,
       "y": 1,
       "elevation": 0,
-      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_map": "MAP_UNION_ROOM",
       "dest_warp_id": 0
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
-      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_map": "MAP_TRADE_CENTER",
       "dest_warp_id": 0
     }
   ],

data/maps/CeladonCity_PokemonCenter_2F/scripts.inc

@@ -1,18 +1,19 @@
 CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F
-	map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
-	map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
-	map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
-	map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634
+@ The below 3 are unused and leftover from RS
-	call EventScript_1BB4A3
+CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634
+	call CableClub_EventScript_Colosseum
 	end
 
-EventScript_16C63A:: @ 816C63A
+CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A
-	call EventScript_1BB6AB
+	call CableClub_EventScript_TradeCenter
 	end
 
-EventScript_16C640:: @ 816C640
+CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640
-	call EventScript_1BB7DE
+	call CableClub_EventScript_RecordCorner
 	end

data/maps/CeladonCity_Restaurant/scripts.inc

@@ -2,24 +2,22 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA
 	.byte 0
 
 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB
-	msgbox gUnknown_81978E6, 2
+	msgbox gUnknown_81978E6, MSGBOX_NPC
 	end
 
 CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
-	msgbox gUnknown_8197915, 2
+	msgbox gUnknown_8197915, MSGBOX_NPC
 	end
 
 CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
 	lock
 	faceplayer
-	checkflag FLAG_GOT_COIN_CASE
+	goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B
-	goto_if TRUE, EventScript_16D24B
 	msgbox gUnknown_81979C1
 	checkitemspace ITEM_COIN_CASE, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16D241
+	goto_if_eq EventScript_16D241
-	additem ITEM_COIN_CASE, 1
+	giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE
-	giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
 	setflag FLAG_GOT_COIN_CASE
 	release
 	end
@@ -35,9 +33,9 @@ EventScript_16D24B:: @ 816D24B
 	end
 
 CeladonCity_Restaurant_EventScript_16D255:: @ 816D255
-	msgbox gUnknown_8197952, 2
+	msgbox gUnknown_8197952, MSGBOX_NPC
 	end
 
 CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E
-	msgbox gUnknown_819798A, 2
+	msgbox gUnknown_819798A, MSGBOX_NPC
 	end

data/maps/CeruleanCave_1F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BEA47",
+      "script": "CeruleanCave_1F_EventScript_ItemNugget",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BEA54",
+      "script": "CeruleanCave_1F_EventScript_ItemFullRestore",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BEA3A",
+      "script": "CeruleanCave_1F_EventScript_ItemMaxElixir",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
     },
     {

data/maps/CeruleanCave_1F/scripts.inc

@@ -1,7 +1,7 @@
 CeruleanCave_1F_MapScripts:: @ 81624B3
-	map_script 3, CeruleanCave_1F_MapScript1_1624B9
+	map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_1F_OnTransition
 	.byte 0
 
-CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9
+CeruleanCave_1F_OnTransition:: @ 81624B9
 	setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F
 	end

data/maps/CeruleanCave_2F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BEA6E",
+      "script": "CeruleanCave_2F_EventScript_ItemPPUp",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BEA7B",
+      "script": "CeruleanCave_2F_EventScript_ItemUltraBall",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BEA61",
+      "script": "CeruleanCave_2F_EventScript_ItemFullRestore",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
     },
     {

data/maps/CeruleanCave_B1F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BEA95",
+      "script": "CeruleanCave_B1F_EventScript_ItemUltraBall",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BEA88",
+      "script": "CeruleanCave_B1F_EventScript_ItemMaxRevive",
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
     },
     {

data/maps/CeruleanCave_B1F/scripts.inc

@@ -1,23 +1,21 @@
 CeruleanCave_B1F_MapScripts:: @ 81624BE
-	map_script 5, CeruleanCave_B1F_MapScript1_1624C9
+	map_script MAP_SCRIPT_ON_RESUME, CeruleanCave_B1F_OnResume
-	map_script 3, CeruleanCave_B1F_MapScript2_1624E7
+	map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_B1F_OnTransition
 	.byte 0
 
-CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
+CeruleanCave_B1F_OnResume:: @ 81624C9
-	checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
+	call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3
-	call_if TRUE, EventScript_1624D3
 	end
 
 EventScript_1624D3:: @ 81624D3
 	specialvar VAR_RESULT, Special_GetBattleOutcome
-	compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
+	compare VAR_RESULT, B_OUTCOME_CAUGHT
-	goto_if ne, EventScript_1A77A9
+	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
 	return
 
-CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
+CeruleanCave_B1F_OnTransition:: @ 81624E7
-	checkflag FLAG_FOUGHT_MEWTWO
+	call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1
-	call_if FALSE, EventScript_1624F1
 	end
 
 EventScript_1624F1:: @ 81624F1
@@ -26,8 +24,8 @@ EventScript_1624F1:: @ 81624F1
 
 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	special sub_8112364
 	lock
 	faceplayer
@@ -45,26 +43,26 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
-	compare_var_to_value VAR_RESULT, B_OUTCOME_WON
+	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if eq, EventScript_162558
+	goto_if_eq EventScript_162558
-	compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
+	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if eq, EventScript_162561
+	goto_if_eq EventScript_162561
-	compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if eq, EventScript_162561
+	goto_if_eq EventScript_162561
 	setflag FLAG_FOUGHT_MEWTWO
 	release
 	end
 
 EventScript_162558:: @ 8162558
 	setflag FLAG_FOUGHT_MEWTWO
-	goto EventScript_1A922D
+	goto EventScript_RemoveStaticMon
 
 EventScript_162560:: @ 8162560
 	end
 
 EventScript_162561:: @ 8162561
 	setvar VAR_0x8004, SPECIES_MEWTWO
-	goto EventScript_1A9236
+	goto EventScript_MonFlewAway
 
 EventScript_16256B:: @ 816256B
 	end

data/maps/CeruleanCity/scripts.inc

@@ -1,11 +1,10 @@
 CeruleanCity_MapScripts:: @ 8166471
-	map_script 3, CeruleanCity_MapScript1_166477
+	map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition
 	.byte 0
 
-CeruleanCity_MapScript1_166477:: @ 8166477
+CeruleanCity_OnTransition:: @ 8166477
 	setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
-	checkflag FLAG_GOT_SS_TICKET
+	call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484
-	call_if FALSE, EventScript_166484
 	end
 
 EventScript_166484:: @ 8166484
@@ -16,20 +15,20 @@ EventScript_166484:: @ 8166484
 
 CeruleanCity_EventScript_16649A:: @ 816649A
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_1664CC
 	end
 
 CeruleanCity_EventScript_1664A6:: @ 81664A6
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	setobjectxyperm 8, 23, 0
 	goto EventScript_1664CC
 	end
 
 CeruleanCity_EventScript_1664B9:: @ 81664B9
 	lockall
-	setvar VAR_0x4001, 2
+	setvar VAR_TEMP_1, 2
 	setobjectxyperm 8, 24, 0
 	goto EventScript_1664CC
 	end
@@ -43,22 +42,22 @@ EventScript_1664CC:: @ 81664CC
 	waitmovement 0
 	msgbox gUnknown_817EAD7
 	setvar VAR_LAST_TALKED, 8
-	compare_var_to_value VAR_STARTER_MON, 2
+	compare VAR_STARTER_MON, 2
-	call_if eq, EventScript_166582
+	call_if_eq EventScript_166582
-	compare_var_to_value VAR_STARTER_MON, 1
+	compare VAR_STARTER_MON, 1
-	call_if eq, EventScript_16658D
+	call_if_eq EventScript_16658D
-	compare_var_to_value VAR_STARTER_MON, 0
+	compare VAR_STARTER_MON, 0
-	call_if eq, EventScript_166598
+	call_if_eq EventScript_166598
 	famechecker FAMECHECKER_BILL, 0
 	msgbox gUnknown_817EB95
 	closemessage
 	playbgm MUS_RIVAL2, 0
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_1665A3
+	call_if_eq EventScript_1665A3
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_1665A3
+	call_if_eq EventScript_1665A3
-	compare_var_to_value VAR_0x4001, 2
+	compare VAR_TEMP_1, 2
-	call_if eq, EventScript_1665B5
+	call_if_eq EventScript_1665B5
 	msgbox gUnknown_817ECD4
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
 	setflag FLAG_GOT_FAME_CHECKER
@@ -73,111 +72,110 @@ EventScript_1664CC:: @ 81664CC
 	end
 
 EventScript_166582:: @ 8166582
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
+	trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71
 	return
 
 EventScript_16658D:: @ 816658D
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
+	trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71
 	return
 
 EventScript_166598:: @ 8166598
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
+	trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71
 	return
 
 EventScript_1665A3:: @ 81665A3
-	applymovement 255, Movement_1665C7
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1665C7
 	applymovement 8, Movement_1665D9
 	waitmovement 0
 	return
 
 EventScript_1665B5:: @ 81665B5
-	applymovement 255, Movement_1665CD
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1665CD
 	applymovement 8, Movement_1665EA
 	waitmovement 0
 	return
 
 Movement_1665C7:: @ 81665C7
-	step_1c
+	delay_16
-	step_1b
+	delay_8
-	step_30
+	walk_in_place_fastest_right
-	step_1c
+	delay_16
-	step_2d
+	walk_in_place_fastest_down
 	step_end
 
 Movement_1665CD:: @ 81665CD
-	step_1c
+	delay_16
-	step_1b
+	delay_8
-	step_2f
+	walk_in_place_fastest_left
-	step_1c
+	delay_16
-	step_2d
+	walk_in_place_fastest_down
 	step_end
 
 Movement_1665D3:: @ 81665D3
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
 	step_end
 
 Movement_1665D9:: @ 81665D9
-	step_13
+	walk_right
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_12
+	walk_left
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_11
+	walk_up
 	step_end
 
 Movement_1665EA:: @ 81665EA
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_13
+	walk_right
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_11
+	walk_up
 	step_end
 
 Movement_1665FB:: @ 81665FB
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
 	step_end
 
 CeruleanCity_EventScript_166603:: @ 8166603
 	lock
 	faceplayer
-	checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5
+	goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E
-	goto_if eq, EventScript_16662E
 	message Text_17EE0E
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto EventScript_16662E
 	end
@@ -185,15 +183,14 @@ CeruleanCity_EventScript_166603:: @ 8166603
 EventScript_16662E:: @ 816662E
 	msgbox gUnknown_817EE9C
 	checkitemspace ITEM_TM28, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_166677
+	goto_if_eq EventScript_166677
-	additem ITEM_TM28, 1
+	giveitem_msg gUnknown_817EEBF, ITEM_TM28
-	giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28
 	msgbox gUnknown_817EEED
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	setflag FLAG_GOT_TM28_FROM_ROCKET
 	release
 	end
@@ -206,20 +203,20 @@ EventScript_166677:: @ 8166677
 
 CeruleanCity_EventScript_166683:: @ 8166683
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
-	applymovement 2, Movement_1A75E9
+	applymovement 2, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 255, Movement_1A75ED
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	goto EventScript_1666C3
 	end
 
 CeruleanCity_EventScript_1666A3:: @ 81666A3
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
-	applymovement 2, Movement_1A75ED
+	applymovement 2, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 255, Movement_1A75E9
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto EventScript_1666C3
 	end
@@ -228,7 +225,7 @@ EventScript_1666C3:: @ 81666C3
 	textcolor 0
 	msgbox Text_17EE0E
 	setvar VAR_LAST_TALKED, 2
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto EventScript_16662E
 	end
@@ -238,7 +235,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
 	faceplayer
 	msgbox gUnknown_817F0F1
 	closemessage
-	applymovement 1, Movement_1A75E5
+	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -246,8 +243,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
 CeruleanCity_EventScript_1666FE:: @ 81666FE
 	lock
 	faceplayer
-	checkflag FLAG_GOT_SS_TICKET
+	goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713
-	goto_if TRUE, EventScript_166713
 	msgbox gUnknown_817F01D
 	release
 	end
@@ -258,15 +254,15 @@ EventScript_166713:: @ 8166713
 	end
 
 CeruleanCity_EventScript_16671D:: @ 816671D
-	msgbox gUnknown_817F0B2, 2
+	msgbox gUnknown_817F0B2, MSGBOX_NPC
 	end
 
 CeruleanCity_EventScript_166726:: @ 8166726
-	msgbox gUnknown_817EF3F, 2
+	msgbox gUnknown_817EF3F, MSGBOX_NPC
 	end
 
 CeruleanCity_EventScript_16672F:: @ 816672F
-	msgbox gUnknown_817F319, 2
+	msgbox gUnknown_817F319, MSGBOX_NPC
 	end
 
 CeruleanCity_EventScript_166738:: @ 8166738
@@ -274,7 +270,7 @@ CeruleanCity_EventScript_166738:: @ 8166738
 	faceplayer
 	msgbox gUnknown_817F2CF
 	closemessage
-	applymovement 11, Movement_1A75E5
+	applymovement 11, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -283,24 +279,24 @@ CeruleanCity_EventScript_16674F:: @ 816674F
 	lock
 	random 3
 	copyvar VAR_0x8008, VAR_RESULT
-	compare_var_to_value VAR_0x8008, 0
+	compare VAR_0x8008, 0
-	call_if eq, EventScript_1667B0
+	call_if_eq EventScript_1667B0
-	compare_var_to_value VAR_0x8008, 1
+	compare VAR_0x8008, 1
-	call_if eq, EventScript_1667B6
+	call_if_eq EventScript_1667B6
-	compare_var_to_value VAR_0x8008, 2
+	compare VAR_0x8008, 2
-	call_if eq, EventScript_1667BC
+	call_if_eq EventScript_1667BC
 	waitmessage
 	delay 40
 	playse SE_PIN
-	applymovement 5, Movement_1A75D9
+	applymovement 5, Movement_QuestionMark
 	waitmovement 0
 	delay 30
-	compare_var_to_value VAR_0x8008, 0
+	compare VAR_0x8008, 0
-	call_if eq, EventScript_1667C2
+	call_if_eq EventScript_1667C2
-	compare_var_to_value VAR_0x8008, 1
+	compare VAR_0x8008, 1
-	call_if eq, EventScript_1667CB
+	call_if_eq EventScript_1667CB
-	compare_var_to_value VAR_0x8008, 2
+	compare VAR_0x8008, 2
-	call_if eq, EventScript_1667D4
+	call_if_eq EventScript_1667D4
 	release
 	end
 
@@ -332,14 +328,14 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD
 	lock
 	random 4
 	copyvar VAR_0x8008, VAR_RESULT
-	compare_var_to_value VAR_0x8008, 0
+	compare VAR_0x8008, 0
-	call_if eq, EventScript_166814
+	call_if_eq EventScript_166814
-	compare_var_to_value VAR_0x8008, 1
+	compare VAR_0x8008, 1
-	call_if eq, EventScript_16681D
+	call_if_eq EventScript_16681D
-	compare_var_to_value VAR_0x8008, 2
+	compare VAR_0x8008, 2
-	call_if eq, EventScript_166826
+	call_if_eq EventScript_166826
-	compare_var_to_value VAR_0x8008, 3
+	compare VAR_0x8008, 3
-	call_if eq, EventScript_16682F
+	call_if_eq EventScript_16682F
 	release
 	end
 
@@ -360,15 +356,15 @@ EventScript_16682F:: @ 816682F
 	return
 
 CeruleanCity_EventScript_166838:: @ 8166838
-	msgbox gUnknown_817F420, 3
+	msgbox gUnknown_817F420, MSGBOX_SIGN
 	end
 
 CeruleanCity_EventScript_166841:: @ 8166841
-	msgbox gUnknown_817F453, 3
+	msgbox gUnknown_817F453, MSGBOX_SIGN
 	end
 
 CeruleanCity_EventScript_16684A:: @ 816684A
-	msgbox gUnknown_817F4C5, 3
+	msgbox gUnknown_817F4C5, MSGBOX_SIGN
 	end
 
 CeruleanCity_EventScript_166853:: @ 8166853

data/maps/CeruleanCity_BikeShop/scripts.inc

@@ -4,10 +4,8 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
 CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
 	lock
 	faceplayer
-	checkflag FLAG_GOT_BICYCLE
+	goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58
-	goto_if TRUE, EventScript_16AC58
+	goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22
-	checkflag FLAG_GOT_BIKE_VOUCHER
-	goto_if TRUE, EventScript_16AC22
 	showmoneybox 0, 0, 0
 	message Text_192755
 	waitmessage
@@ -31,9 +29,9 @@ EventScript_16AC15:: @ 816AC15
 
 EventScript_16AC22:: @ 816AC22
 	msgbox gUnknown_81927B2
-	giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
+	msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
 	setflag FLAG_GOT_BICYCLE
-	additem ITEM_BICYCLE, 1
+	additem ITEM_BICYCLE
 	removeitem ITEM_BIKE_VOUCHER, 1
 	msgbox gUnknown_819280E
 	release
@@ -50,14 +48,13 @@ EventScript_16AC62:: @ 816AC62
 	end
 
 CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
-	msgbox gUnknown_81928CF, 2
+	msgbox gUnknown_81928CF, MSGBOX_NPC
 	end
 
 CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
 	lock
 	faceplayer
-	checkflag FLAG_GOT_BICYCLE
+	goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A
-	goto_if TRUE, EventScript_16AC8A
 	msgbox gUnknown_8192937
 	release
 	end
@@ -69,5 +66,5 @@ EventScript_16AC8A:: @ 816AC8A
 
 CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94
 CeruleanCity_EventScript_16AC94:: @ 816AC94
-	msgbox gUnknown_81929AD, 3
+	msgbox gUnknown_81929AD, MSGBOX_SIGN
 	end

data/maps/CeruleanCity_Gym/scripts.inc

@@ -3,9 +3,8 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
 
 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
 	famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
+	trainerbattle_single TRAINER_LEADER_MISTY, Text_1921EF, Text_19242D, EventScript_16AAD3, NO_MUSIC
-	checkflag FLAG_GOT_TM03_FROM_MISTY
+	goto_if_unset FLAG_GOT_TM03_FROM_MISTY, EventScript_16AAF9
-	goto_if FALSE, EventScript_16AAF9
 	msgbox gUnknown_81922BF
 	release
 	end
@@ -22,10 +21,9 @@ EventScript_16AAD3:: @ 816AAD3
 EventScript_16AAF9:: @ 816AAF9
 	msgbox gUnknown_81922F7
 	checkitemspace ITEM_TM03, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16AB3A
+	goto_if_eq EventScript_16AB3A
-	additem ITEM_TM03, 1
+	giveitem_msg gUnknown_81923F1, ITEM_TM03
-	giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
 	setflag FLAG_GOT_TM03_FROM_MISTY
 	msgbox gUnknown_81922BF
 	release
@@ -37,21 +35,20 @@ EventScript_16AB3A:: @ 816AB3A
 	end
 
 CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0
+	trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0
-	msgbox gUnknown_81924E4, 6
+	msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE
 	end
 
 CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
+	trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547
 	famechecker FAMECHECKER_MISTY, 2
-	msgbox gUnknown_8192556, 6
+	msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE
 	end
 
 CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_MISTY
+	goto_if_set FLAG_DEFEATED_MISTY, EventScript_16AB94
-	goto_if TRUE, EventScript_16AB94
 	msgbox gUnknown_81925AC
 	release
 	end
@@ -63,8 +60,7 @@ EventScript_16AB94:: @ 816AB94
 
 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
 	lockall
-	checkflag FLAG_BADGE02_GET
+	goto_if_set FLAG_BADGE02_GET, EventScript_16ABB2
-	goto_if TRUE, EventScript_16ABB2
 	msgbox gUnknown_81926E1
 	releaseall
 	end

data/maps/CeruleanCity_House2/scripts.inc

@@ -4,8 +4,7 @@ CeruleanCity_House2_MapScripts:: @ 816A975
 CeruleanCity_House2_EventScript_16A976:: @ 816A976
 	lock
 	faceplayer
-	checkflag FLAG_GOT_TM28_FROM_ROCKET
+	goto_if_set FLAG_GOT_TM28_FROM_ROCKET, EventScript_16A98B
-	goto_if TRUE, EventScript_16A98B
 	msgbox gUnknown_8191E13
 	release
 	end
@@ -16,9 +15,9 @@ EventScript_16A98B:: @ 816A98B
 	end
 
 CeruleanCity_House2_EventScript_16A995:: @ 816A995
-	msgbox gUnknown_8191F2A, 2
+	msgbox gUnknown_8191F2A, MSGBOX_NPC
 	end
 
 CeruleanCity_House2_EventScript_16A99E:: @ 816A99E
-	msgbox gUnknown_8191F64, 3
+	msgbox gUnknown_8191F64, MSGBOX_SIGN
 	end

data/maps/CeruleanCity_House3/scripts.inc

@@ -2,7 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7
 	.byte 0
 
 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8
-	msgbox gUnknown_8191F80, 2
+	msgbox gUnknown_8191F80, MSGBOX_NPC
 	end
 
 CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
@@ -10,17 +10,16 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
 	faceplayer
 	setvar VAR_0x8008, 1
 	call EventScript_1A8CAD
-	checkflag FLAG_DID_ZYNX_TRADE
+	goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23
-	goto_if TRUE, EventScript_16AA23
 	msgbox gUnknown_81A59FE, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16AA0B
+	goto_if_eq EventScript_16AA0B
 	call EventScript_1A8CBD
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
-	goto_if ge, EventScript_16AA0B
+	goto_if_ge EventScript_16AA0B
 	call EventScript_1A8CC9
-	compare_var_to_var VAR_RESULT, VAR_0x8009
+	compare VAR_RESULT, VAR_0x8009
-	goto_if ne, EventScript_16AA15
+	goto_if_ne EventScript_16AA15
 	call EventScript_1A8CD9
 	msgbox gUnknown_81A5A9D
 	setflag FLAG_DID_ZYNX_TRADE

data/maps/CeruleanCity_House4/scripts.inc

@@ -3,26 +3,26 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
 
 CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	special sub_8112364
 	lock
 	specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
 	copyvar VAR_0x8008, VAR_RESULT
-	compare_var_to_value VAR_0x8004, 0
+	compare VAR_0x8004, 0
-	goto_if eq, EventScript_CeruleanCity_House4_NoNews
+	goto_if_eq EventScript_CeruleanCity_House4_NoNews
-	compare_var_to_value VAR_0x8004, 1
+	compare VAR_0x8004, 1
-	goto_if eq, EventScript_CeruleanCity_House4_News1
+	goto_if_eq EventScript_CeruleanCity_House4_News1
-	compare_var_to_value VAR_0x8004, 2
+	compare VAR_0x8004, 2
-	goto_if eq, EventScript_CeruleanCity_House4_News2
+	goto_if_eq EventScript_CeruleanCity_House4_News2
-	compare_var_to_value VAR_0x8004, 3
+	compare VAR_0x8004, 3
-	goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread
+	goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread
-	compare_var_to_value VAR_0x8004, 4
+	compare VAR_0x8004, 4
-	goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1
+	goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1
-	compare_var_to_value VAR_0x8004, 5
+	compare VAR_0x8004, 5
-	goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2
+	goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
-	goto_if eq, EventScript_CeruleanCity_House4_NewsDone
+	goto_if_eq EventScript_CeruleanCity_House4_NewsDone
 	end
 
 EventScript_CeruleanCity_House4_NoNews:: @ 816AD59
@@ -34,8 +34,8 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63
 	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192B43
 	giveitem VAR_0x8008
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16AE45
+	goto_if_eq EventScript_16AE45
 	release
 	end
 
@@ -43,13 +43,13 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89
 	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192C07
 	giveitem VAR_0x8008, 4
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16AE45
+	goto_if_eq EventScript_16AE45
 	release
 	end
 
 EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF
-	applymovement 1, Movement_1A75E1
+	applymovement 1, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_8192CD5
 	release
@@ -59,8 +59,8 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3
 	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192D4B
 	giveitem VAR_0x8008
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16AE45
+	goto_if_eq EventScript_16AE45
 	release
 	end
 
@@ -68,13 +68,13 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
 	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192DE3
 	giveitem VAR_0x8008, 4
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16AE45
+	goto_if_eq EventScript_16AE45
 	release
 	end
 
 EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
-	applymovement 1, Movement_1A75E1
+	applymovement 1, Movement_FacePlayer
 	waitmovement 0
 	msgbox gUnknown_8192EC5
 	release
@@ -82,11 +82,11 @@ EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
 
 EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23
 	playse SE_PIN
-	applymovement 1, Movement_1A75DB
+	applymovement 1, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Movement_1A75E1
+	applymovement 1, Movement_FacePlayer
 	waitmovement 0
-	applymovement 1, Movement_1A75DD
+	applymovement 1, Movement_Delay48
 	waitmovement 0
 	return
 

data/maps/CeruleanCity_House5/scripts.inc

@@ -4,18 +4,16 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F
 CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
 	lock
 	faceplayer
-	checkflag FLAG_GOT_POWDER_JAR
+	goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7
-	goto_if TRUE, EventScript_16AEB7
 	msgbox gUnknown_8192F67, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16AEAD
+	goto_if_eq EventScript_16AEAD
-	checkflag FLAG_SYS_GOT_BERRY_POUCH
+	goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3
-	goto_if FALSE, EventScript_16AEA3
 	msgbox gUnknown_8193003
 	setflag FLAG_GOT_POWDER_JAR
 	giveitem ITEM_POWDER_JAR
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_1A6BF9
+	goto_if_eq EventScript_BagIsFull
 	msgbox gUnknown_8193033
 	release
 	end
@@ -143,28 +141,28 @@ EventScript_16B048:: @ 816B048
 
 EventScript_16B055:: @ 816B055
 	msgbox gUnknown_819331E, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	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
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16B0CC
+	goto_if_eq EventScript_16B0CC
 	giveitem VAR_0x8008
-	compare_var_to_value VAR_RESULT, 0
+	compare 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
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16AEC8
+	goto_if_eq EventScript_16AEC8
 	msgbox gUnknown_81933FB
 	special sub_815F114
 	release
 	end
 
 EventScript_16B0BF:: @ 816B0BF
-	msgbox gUnknown_81A5207
+	msgbox Text_BagIsFull
 	special sub_815F114
 	release
 	end
@@ -177,8 +175,8 @@ EventScript_16B0CC:: @ 816B0CC
 CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
 	lockall
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	special sub_814EA7C
 	waitstate
 	releaseall

data/maps/CeruleanCity_Mart/scripts.inc

@@ -2,23 +2,23 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D
 	.byte 0
 
 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E
-	msgbox gUnknown_81929C2, 2
+	msgbox gUnknown_81929C2, MSGBOX_NPC
 	end
 
 CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
-	msgbox gUnknown_8192A79, 2
+	msgbox gUnknown_8192A79, MSGBOX_NPC
 	end
 
 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16ACD8
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 

data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc

@@ -1,25 +1,25 @@
 CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D
-	map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38
+	map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition
-	map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38
+CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38
 	setrespawn SPAWN_CERULEAN_CITY
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
 	lock
 	faceplayer
-	call EventScript_1A6578
+	call EventScript_PkmnCenterNurse
 	release
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45
-	msgbox gUnknown_8192079, 2
+	msgbox gUnknown_8192079, MSGBOX_NPC
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
-	msgbox gUnknown_8191FFB, 2
+	msgbox gUnknown_8191FFB, MSGBOX_NPC
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
@@ -31,5 +31,5 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70
-	msgbox gUnknown_819214C, 2
+	msgbox gUnknown_819214C, MSGBOX_NPC
 	end

data/maps/CeruleanCity_PokemonCenter_2F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_MG_DELIVERYMEN"
     }
   ],
@@ -78,14 +78,14 @@
       "x": 5,
       "y": 1,
       "elevation": 0,
-      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_map": "MAP_UNION_ROOM",
       "dest_warp_id": 0
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
-      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_map": "MAP_TRADE_CENTER",
       "dest_warp_id": 0
     }
   ],

data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc

@@ -1,18 +1,19 @@
 CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79
-	map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
-	map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
-	map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
-	map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E
+@ The below 3 are unused and leftover from RS
-	call EventScript_1BB4A3
+CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E
+	call CableClub_EventScript_Colosseum
 	end
 
-EventScript_16AA94:: @ 816AA94
+CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94
-	call EventScript_1BB6AB
+	call CableClub_EventScript_TradeCenter
 	end
 
-EventScript_16AA9A:: @ 816AA9A
+CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A
-	call EventScript_1BB7DE
+	call CableClub_EventScript_RecordCorner
 	end

data/maps/CinnabarIsland/map.json

@@ -120,7 +120,7 @@
       "x": 20,
       "y": 5,
       "elevation": 3,
-      "var": "VAR_0x4001",
+      "var": "VAR_TEMP_1",
       "var_value": 0,
       "script": "CinnabarIsland_EventScript_1671CA"
     }

data/maps/CinnabarIsland/scripts.inc

@@ -1,17 +1,17 @@
 CinnabarIsland_MapScripts:: @ 8166ED6
-	map_script 3, CinnabarIsland_MapScript1_166EE1
+	map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition
-	map_script 2, CinnabarIsland_MapScript2_166F6E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame
 	.byte 0
 
-CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
+CinnabarIsland_OnTransition:: @ 8166EE1
 	setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
 	call EventScript_166F5E
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1
-	call_if eq, EventScript_166F24
+	call_if_eq EventScript_166F24
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3
-	call_if eq, EventScript_166F52
+	call_if_eq EventScript_166F52
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
-	call_if eq, EventScript_166F0B
+	call_if_eq EventScript_166F0B
 	end
 
 EventScript_166F0B:: @ 8166F0B
@@ -24,8 +24,8 @@ EventScript_166F0B:: @ 8166F0B
 
 EventScript_166F24:: @ 8166F24
 	getplayerxy VAR_0x8004, VAR_0x8005
-	compare_var_to_value VAR_0x8004, 18
+	compare VAR_0x8004, 18
-	goto_if ge, EventScript_166F4A
+	goto_if_ge EventScript_166F4A
 	setflag FLAG_TEMP_2
 	setobjectxyperm 3, 18, 12
 	setobjectmovementtype 3, 7
@@ -42,15 +42,14 @@ EventScript_166F52:: @ 8166F52
 	return
 
 EventScript_166F5E:: @ 8166F5E
-	checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY
+	goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68
-	goto_if TRUE, EventScript_166F68
 	return
 
 EventScript_166F68:: @ 8166F68
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	return
 
-CinnabarIsland_MapScript2_166F6E:: @ 8166F6E
+CinnabarIsland_OnFrame:: @ 8166F6E
 	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
@@ -82,45 +81,41 @@ EventScript_166FA0:: @ 8166FA0
 	end
 
 Movement_166FC6:: @ 8166FC6
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
 	step_end
 
 EventScript_166FCD:: @ 8166FCD
 	lockall
 	textcolor 0
-	checkflag FLAG_TEMP_2
+	call_if_unset FLAG_TEMP_2, EventScript_167032
-	call_if FALSE, EventScript_167032
+	call_if_set FLAG_TEMP_2, EventScript_16703D
-	checkflag FLAG_TEMP_2
-	call_if TRUE, EventScript_16703D
 	playse SE_PIN
-	applymovement 3, Movement_1A75DB
+	applymovement 3, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_1A75DD
+	applymovement 3, Movement_Delay48
 	waitmovement 0
-	checkflag FLAG_TEMP_2
+	call_if_unset FLAG_TEMP_2, EventScript_167048
-	call_if FALSE, EventScript_167048
+	call_if_set FLAG_TEMP_2, EventScript_167053
-	checkflag FLAG_TEMP_2
-	call_if TRUE, EventScript_167053
 	msgbox gUnknown_8180C90
 	msgbox gUnknown_8180CAA, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_167068
+	goto_if_eq EventScript_167068
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_167078
+	goto_if_eq EventScript_167078
 	end
 
 EventScript_167032:: @ 8167032
-	applymovement 3, Movement_1A75E9
+	applymovement 3, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 EventScript_16703D:: @ 816703D
-	applymovement 3, Movement_1A75E7
+	applymovement 3, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -132,7 +127,7 @@ EventScript_167048:: @ 8167048
 EventScript_167053:: @ 8167053
 	applymovement 3, Movement_1671A6
 	waitmovement 0
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
@@ -146,10 +141,8 @@ EventScript_167068:: @ 8167068
 EventScript_167078:: @ 8167078
 	msgbox gUnknown_8180DF8
 	closemessage
-	checkflag FLAG_TEMP_2
+	call_if_unset FLAG_TEMP_2, EventScript_1670A0
-	call_if FALSE, EventScript_1670A0
+	call_if_set FLAG_TEMP_2, EventScript_1670B3
-	checkflag FLAG_TEMP_2
-	call_if TRUE, EventScript_1670B3
 	removeobject 3
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
 	clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
@@ -162,17 +155,17 @@ EventScript_1670A0:: @ 81670A0
 	return
 
 Movement_1670AB:: @ 81670AB
-	step_13
+	walk_right
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
 	step_end
 
 EventScript_1670B3:: @ 81670B3
-	applymovement 255, Movement_1670DB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1670DB
 	applymovement 3, Movement_1670DE
 	waitmovement 0
 	opendoor 14, 11
@@ -184,36 +177,31 @@ EventScript_1670B3:: @ 81670B3
 	return
 
 Movement_1670DB:: @ 81670DB
-	step_12
+	walk_left
-	step_30
+	walk_in_place_fastest_right
 	step_end
 
 Movement_1670DE:: @ 81670DE
-	step_1c
+	delay_16
-	step_12
+	walk_left
-	step_2e
+	walk_in_place_fastest_up
 	step_end
 
 Movement_1670E2:: @ 81670E2
-	step_11
+	walk_up
-	step_1a
+	delay_4
-	step_60
+	set_invisible
 	step_end
 
 EventScript_1670E6:: @ 81670E6
-	checkflag FLAG_TEMP_2
+	call_if_set FLAG_TEMP_2, EventScript_167142
-	call_if TRUE, EventScript_167142
 	addobject 4
-	checkflag FLAG_TEMP_2
+	call_if_unset FLAG_TEMP_2, EventScript_167154
-	call_if FALSE, EventScript_167154
+	call_if_set FLAG_TEMP_2, EventScript_167166
-	checkflag FLAG_TEMP_2
-	call_if TRUE, EventScript_167166
 	msgbox gUnknown_8180EAD
 	closemessage
-	checkflag FLAG_TEMP_2
+	call_if_unset FLAG_TEMP_2, EventScript_167171
-	call_if FALSE, EventScript_167171
+	call_if_set FLAG_TEMP_2, EventScript_167183
-	checkflag FLAG_TEMP_2
-	call_if TRUE, EventScript_167183
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
 	removeobject 3
 	delay 40
@@ -226,7 +214,7 @@ EventScript_1670E6:: @ 81670E6
 
 EventScript_167142:: @ 8167142
 	applymovement 3, Movement_1671AF
-	applymovement 255, Movement_1671AF
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1671AF
 	waitmovement 0
 	return
 
@@ -243,101 +231,101 @@ EventScript_167166:: @ 8167166
 
 EventScript_167171:: @ 8167171
 	applymovement 3, Movement_16719D
-	applymovement 255, Movement_1671BA
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1671BA
 	waitmovement 0
 	return
 
 EventScript_167183:: @ 8167183
 	applymovement 3, Movement_1671B6
-	applymovement 255, Movement_1671C4
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1671C4
 	waitmovement 0
 	return
 
 Movement_167195:: @ 8167195
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_1f
+	walk_fast_left
-	step_1f
+	walk_fast_left
-	step_12
+	walk_left
-	step_left
+	walk_slowest_left
-	step_left
+	walk_slowest_left
 	step_end
 
 Movement_16719D:: @ 816719D
-	step_13
+	walk_right
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_13
+	walk_right
-	step_1a
+	delay_4
-	step_60
+	set_invisible
 	step_end
 
 Movement_1671A4:: @ 81671A4
-	step_11
+	walk_up
 	step_end
 
 Movement_1671A6:: @ 81671A6
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
 	step_end
 
 Movement_1671AA:: @ 81671AA
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_1b
+	delay_8
-	step_30
+	walk_in_place_fastest_right
 	step_end
 
 Movement_1671AF:: @ 81671AF
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
-	step_13
+	walk_right
 	step_end
 
 Movement_1671B6:: @ 81671B6
-	step_13
+	walk_right
-	step_1a
+	delay_4
-	step_60
+	set_invisible
 	step_end
 
 Movement_1671BA:: @ 81671BA
-	step_10
+	walk_down
-	step_13
+	walk_right
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_30
+	walk_in_place_fastest_right
-	step_1a
+	delay_4
-	step_13
+	walk_right
-	step_1a
+	delay_4
-	step_60
+	set_invisible
 	step_end
 
 Movement_1671C4:: @ 81671C4
-	step_13
+	walk_right
-	step_1a
+	delay_4
-	step_13
+	walk_right
-	step_1a
+	delay_4
-	step_60
+	set_invisible
 	step_end
 
 CinnabarIsland_EventScript_1671CA:: @ 81671CA
 	lockall
-	applymovement 255, Movement_1A75E9
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
 	msgbox gUnknown_8180B20
 	closemessage
-	applymovement 255, Movement_1671ED
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_1671ED
 	waitmovement 0
 	releaseall
 	end
 
 Movement_1671ED:: @ 81671ED
-	step_10
+	walk_down
 	step_end
 
 CinnabarIsland_EventScript_1671EF:: @ 81671EF
@@ -349,15 +337,15 @@ CinnabarIsland_EventScript_1671EF:: @ 81671EF
 	end
 
 CinnabarIsland_EventScript_167208:: @ 8167208
-	msgbox gUnknown_8180BA0, 2
+	msgbox gUnknown_8180BA0, MSGBOX_NPC
 	end
 
 CinnabarIsland_EventScript_167211:: @ 8167211
-	msgbox gUnknown_8180C0D, 3
+	msgbox gUnknown_8180C0D, MSGBOX_SIGN
 	end
 
 CinnabarIsland_EventScript_16721A:: @ 816721A
-	msgbox gUnknown_8180C3E, 3
+	msgbox gUnknown_8180C3E, MSGBOX_SIGN
 	end
 
 CinnabarIsland_EventScript_167223:: @ 8167223

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -1,22 +1,15 @@
 CinnabarIsland_Gym_MapScripts:: @ 816D94B
-	map_script 1, CinnabarIsland_Gym_MapScript1_16D951
+	map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad
 	.byte 0
 
-CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951
+CinnabarIsland_Gym_OnLoad:: @ 816D951
-	checkflag FLAG_DEFEATED_BLAINE
+	goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991
-	goto_if TRUE, EventScript_16D991
+	call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0
-	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6
-	call_if TRUE, EventScript_16D9B0
+	call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC
-	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2
-	call_if TRUE, EventScript_16D9B6
+	call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8
-	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE
-	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
@@ -54,9 +47,8 @@ EventScript_16D9CE:: @ 816D9CE
 
 CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
 	famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
+	trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC
-	checkflag FLAG_GOT_TM38_FROM_BLAINE
+	goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34
-	goto_if FALSE, EventScript_16DA34
 	msgbox gUnknown_819971D
 	release
 	end
@@ -75,10 +67,9 @@ EventScript_16DA06:: @ 816DA06
 EventScript_16DA34:: @ 816DA34
 	msgbox gUnknown_819969E
 	checkitemspace ITEM_TM38, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if eq, EventScript_16DA75
+	goto_if_eq EventScript_16DA75
-	additem ITEM_TM38, 1
+	giveitem_msg gUnknown_81996FF, ITEM_TM38
-	giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
 	setflag FLAG_GOT_TM38_FROM_BLAINE
 	msgbox gUnknown_8199652
 	release
@@ -90,18 +81,17 @@ EventScript_16DA75:: @ 816DA75
 	end
 
 CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
+	trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6
-	msgbox gUnknown_81997EA, 6
+	msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE
 	end
 
 CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
+	trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1
-	msgbox gUnknown_8199911, 6
+	msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DAB1:: @ 816DAB1
-	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC
-	call_if FALSE, EventScript_16DABC
 	release
 	end
 
@@ -110,14 +100,13 @@ EventScript_16DABC:: @ 816DABC
 	return
 
 CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
+	trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA
 	famechecker FAMECHECKER_BLAINE, 2
-	msgbox gUnknown_81999DF, 6
+	msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DAEA:: @ 816DAEA
-	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5
-	call_if FALSE, EventScript_16DAF5
 	release
 	end
 
@@ -126,13 +115,12 @@ EventScript_16DAF5:: @ 816DAF5
 	return
 
 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
+	trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16
-	msgbox gUnknown_8199B27, 6
+	msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB16:: @ 816DB16
-	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21
-	call_if FALSE, EventScript_16DB21
 	release
 	end
 
@@ -141,13 +129,12 @@ EventScript_16DB21:: @ 816DB21
 	return
 
 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
+	trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42
-	msgbox gUnknown_819987D, 6
+	msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB42:: @ 816DB42
-	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D
-	call_if FALSE, EventScript_16DB4D
 	release
 	end
 
@@ -156,13 +143,12 @@ EventScript_16DB4D:: @ 816DB4D
 	return
 
 CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
+	trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E
-	msgbox gUnknown_8199986, 6
+	msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB6E:: @ 816DB6E
-	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79
-	call_if FALSE, EventScript_16DB79
 	release
 	end
 
@@ -171,13 +157,12 @@ EventScript_16DB79:: @ 816DB79
 	return
 
 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
+	trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A
-	msgbox gUnknown_8199AC9, 6
+	msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE
 	end
 
 EventScript_16DB9A:: @ 816DB9A
-	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5
-	call_if FALSE, EventScript_16DBA5
 	release
 	end
 
@@ -188,8 +173,7 @@ EventScript_16DBA5:: @ 816DBA5
 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_BLAINE
+	goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0
-	goto_if TRUE, EventScript_16DBC0
 	msgbox gUnknown_8199B81
 	release
 	end
@@ -201,8 +185,7 @@ EventScript_16DBC0:: @ 816DBC0
 
 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
 	lockall
-	checkflag FLAG_BADGE07_GET
+	goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE
-	goto_if TRUE, EventScript_16DBDE
 	msgbox gUnknown_8199C29
 	releaseall
 	end
@@ -214,23 +197,23 @@ EventScript_16DBDE:: @ 816DBDE
 
 CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_16DC00
 	end
 
 CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_16DC00
 	end
 
 EventScript_16DC00:: @ 816DC00
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199D5A, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16DC43
+	goto_if_eq EventScript_16DC43
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16DC6A
+	goto_if_eq EventScript_16DC6A
 	end
 
 EventScript_16DC27:: @ 816DC27
@@ -249,8 +232,7 @@ EventScript_16DC34:: @ 816DC34
 
 EventScript_16DC43:: @ 816DC43
 	call EventScript_16DC27
-	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DC58
 	releaseall
 	end
@@ -269,71 +251,68 @@ EventScript_16DC68:: @ 816DC68
 
 EventScript_16DC6A:: @ 816DC6A
 	call EventScript_16DC34
-	checktrainerflag TRAINER_BURGLAR_QUINN
+	goto_if_undefeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A
-	goto_if lt, EventScript_16DC7A
 	releaseall
 	end
 
 EventScript_16DC7A:: @ 816DC7A
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16DCB4
+	call_if_eq EventScript_16DCB4
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16DCC6
+	call_if_eq EventScript_16DCC6
 	textcolor 0
 	msgbox gUnknown_819983F
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870
+	trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870
-	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DC58
 	releaseall
 	end
 
 EventScript_16DCB4:: @ 816DCB4
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 1, Movement_16DCD8
 	waitmovement 0
 	return
 
 EventScript_16DCC6:: @ 816DCC6
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 1, Movement_16DCDB
 	waitmovement 0
 	return
 
 Movement_16DCD8:: @ 816DCD8
-	step_12
+	walk_left
-	step_12
+	walk_left
 	step_end
 
 Movement_16DCDB:: @ 816DCDB
-	step_12
+	walk_left
 	step_end
 
 CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_16DCF5
 	end
 
 CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_16DCF5
 	end
 
 EventScript_16DCF5:: @ 816DCF5
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199D79, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16DD41
+	goto_if_eq EventScript_16DD41
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16DD1C
+	goto_if_eq EventScript_16DD1C
 	end
 
 EventScript_16DD1C:: @ 816DD1C
 	call EventScript_16DC27
-	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DD31
 	releaseall
 	end
@@ -348,80 +327,77 @@ EventScript_16DD31:: @ 816DD31
 
 EventScript_16DD41:: @ 816DD41
 	call EventScript_16DC34
-	checktrainerflag TRAINER_SUPER_NERD_AVERY
+	goto_if_undefeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51
-	goto_if lt, EventScript_16DD51
 	releaseall
 	end
 
 EventScript_16DD51:: @ 816DD51
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16DD8B
+	call_if_eq EventScript_16DD8B
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16DD9D
+	call_if_eq EventScript_16DD9D
 	textcolor 0
 	msgbox gUnknown_81998BD
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
+	trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED
-	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DD31
 	releaseall
 	end
 
 EventScript_16DD8B:: @ 816DD8B
-	applymovement 255, Movement_16DDB7
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7
 	applymovement 3, Movement_16DDAF
 	waitmovement 0
 	return
 
 EventScript_16DD9D:: @ 816DD9D
-	applymovement 255, Movement_16DDB7
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7
 	applymovement 3, Movement_16DDB3
 	waitmovement 0
 	return
 
 Movement_16DDAF:: @ 816DDAF
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_12
+	walk_left
 	step_end
 
 Movement_16DDB3:: @ 816DDB3
-	step_11
+	walk_up
-	step_11
+	walk_up
-	step_2f
+	walk_in_place_fastest_left
 	step_end
 
 Movement_16DDB7:: @ 816DDB7
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_30
+	walk_in_place_fastest_right
 	step_end
 
 CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_16DDD3
 	end
 
 CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_16DDD3
 	end
 
 EventScript_16DDD3:: @ 816DDD3
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199DA9, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16DE1F
+	goto_if_eq EventScript_16DE1F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16DDFA
+	goto_if_eq EventScript_16DDFA
 	end
 
 EventScript_16DDFA:: @ 816DDFA
 	call EventScript_16DC27
-	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DE0F
 	releaseall
 	end
@@ -436,71 +412,68 @@ EventScript_16DE0F:: @ 816DE0F
 
 EventScript_16DE1F:: @ 816DE1F
 	call EventScript_16DC34
-	checktrainerflag TRAINER_BURGLAR_RAMON
+	goto_if_undefeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F
-	goto_if lt, EventScript_16DE2F
 	releaseall
 	end
 
 EventScript_16DE2F:: @ 816DE2F
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16DE69
+	call_if_eq EventScript_16DE69
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16DE7B
+	call_if_eq EventScript_16DE7B
 	textcolor 0
 	msgbox gUnknown_8199948
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973
+	trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973
-	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DE0F
 	releaseall
 	end
 
 EventScript_16DE69:: @ 816DE69
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 4, Movement_16DE8D
 	waitmovement 0
 	return
 
 EventScript_16DE7B:: @ 816DE7B
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 4, Movement_16DE90
 	waitmovement 0
 	return
 
 Movement_16DE8D:: @ 816DE8D
-	step_12
+	walk_left
-	step_12
+	walk_left
 	step_end
 
 Movement_16DE90:: @ 816DE90
-	step_12
+	walk_left
 	step_end
 
 CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_16DEAA
 	end
 
 CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_16DEAA
 	end
 
 EventScript_16DEAA:: @ 816DEAA
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199DC6, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16DEF6
+	goto_if_eq EventScript_16DEF6
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16DED1
+	goto_if_eq EventScript_16DED1
 	end
 
 EventScript_16DED1:: @ 816DED1
 	call EventScript_16DC27
-	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DEE6
 	releaseall
 	end
@@ -515,71 +488,68 @@ EventScript_16DEE6:: @ 816DEE6
 
 EventScript_16DEF6:: @ 816DEF6
 	call EventScript_16DC34
-	checktrainerflag TRAINER_SUPER_NERD_DEREK
+	goto_if_undefeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06
-	goto_if lt, EventScript_16DF06
 	releaseall
 	end
 
 EventScript_16DF06:: @ 816DF06
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16DF40
+	call_if_eq EventScript_16DF40
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16DF52
+	call_if_eq EventScript_16DF52
 	textcolor 0
 	msgbox gUnknown_81999B7
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
+	trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB
-	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DEE6
 	releaseall
 	end
 
 EventScript_16DF40:: @ 816DF40
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 5, Movement_16DF64
 	waitmovement 0
 	return
 
 EventScript_16DF52:: @ 816DF52
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 5, Movement_16DF67
 	waitmovement 0
 	return
 
 Movement_16DF64:: @ 816DF64
-	step_12
+	walk_left
-	step_12
+	walk_left
 	step_end
 
 Movement_16DF67:: @ 816DF67
-	step_12
+	walk_left
 	step_end
 
 CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_16DF81
 	end
 
 CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_16DF81
 	end
 
 EventScript_16DF81:: @ 816DF81
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199E00, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16DFA8
+	goto_if_eq EventScript_16DFA8
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16DFCD
+	goto_if_eq EventScript_16DFCD
 	end
 
 EventScript_16DFA8:: @ 816DFA8
 	call EventScript_16DC27
-	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DFBD
 	releaseall
 	end
@@ -594,71 +564,68 @@ EventScript_16DFBD:: @ 816DFBD
 
 EventScript_16DFCD:: @ 816DFCD
 	call EventScript_16DC34
-	checktrainerflag TRAINER_BURGLAR_DUSTY
+	goto_if_undefeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD
-	goto_if lt, EventScript_16DFDD
 	releaseall
 	end
 
 EventScript_16DFDD:: @ 816DFDD
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16E017
+	call_if_eq EventScript_16E017
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16E029
+	call_if_eq EventScript_16E029
 	textcolor 0
 	msgbox gUnknown_8199A7F
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
+	trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9
-	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DFBD
 	releaseall
 	end
 
 EventScript_16E017:: @ 816E017
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 6, Movement_16E03B
 	waitmovement 0
 	return
 
 EventScript_16E029:: @ 816E029
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 6, Movement_16E03E
 	waitmovement 0
 	return
 
 Movement_16E03B:: @ 816E03B
-	step_12
+	walk_left
-	step_12
+	walk_left
 	step_end
 
 Movement_16E03E:: @ 816E03E
-	step_12
+	walk_left
 	step_end
 
 CinnabarIsland_Gym_EventScript_16E040:: @ 816E040
 	lockall
-	setvar VAR_0x4001, 0
+	setvar VAR_TEMP_1, 0
 	goto EventScript_16E058
 	end
 
 CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C
 	lockall
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	goto EventScript_16E058
 	end
 
 EventScript_16E058:: @ 816E058
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199E36, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, YES
-	goto_if eq, EventScript_16E0A4
+	goto_if_eq EventScript_16E0A4
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E07F
+	goto_if_eq EventScript_16E07F
 	end
 
 EventScript_16E07F:: @ 816E07F
 	call EventScript_16DC27
-	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16E094
 	releaseall
 	end
@@ -673,44 +640,42 @@ EventScript_16E094:: @ 816E094
 
 EventScript_16E0A4:: @ 816E0A4
 	call EventScript_16DC34
-	checktrainerflag TRAINER_SUPER_NERD_ZAC
+	goto_if_undefeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4
-	goto_if lt, EventScript_16E0B4
 	releaseall
 	end
 
 EventScript_16E0B4:: @ 816E0B4
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_TEMP_1, 0
-	call_if eq, EventScript_16E0EE
+	call_if_eq EventScript_16E0EE
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
-	call_if eq, EventScript_16E100
+	call_if_eq EventScript_16E100
 	textcolor 0
 	msgbox gUnknown_8199AFC
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
+	trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16
-	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68
-	goto_if TRUE, EventScript_16DC68
 	call EventScript_16E094
 	releaseall
 	end
 
 EventScript_16E0EE:: @ 816E0EE
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 7, Movement_16E112
 	waitmovement 0
 	return
 
 EventScript_16E100:: @ 816E100
-	applymovement 255, Movement_1A75EB
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	applymovement 7, Movement_16E115
 	waitmovement 0
 	return
 
 Movement_16E112:: @ 816E112
-	step_12
+	walk_left
-	step_12
+	walk_left
 	step_end
 
 Movement_16E115:: @ 816E115
-	step_12
+	walk_left
 	step_end
 
 EventScript_16E117:: @ 816E117

data/maps/CinnabarIsland_Mart/scripts.inc

@@ -2,23 +2,23 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F
 	.byte 0
 
 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10
-	msgbox gUnknown_819A7A0, 2
+	msgbox gUnknown_819A7A0, MSGBOX_NPC
 	end
 
 CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
-	msgbox gUnknown_819A7F1, 2
+	msgbox gUnknown_819A7F1, MSGBOX_NPC
 	end
 
 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16EA48
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 

data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc

@@ -1,37 +1,37 @@
 CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7
-	map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2
+	map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition
-	map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2
+CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2
 	setrespawn SPAWN_CINNABAR_ISLAND
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
 	lock
 	faceplayer
-	call EventScript_1A6578
+	call EventScript_PkmnCenterNurse
 	release
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF
-	msgbox gUnknown_819A5BE, 2
+	msgbox gUnknown_819A5BE, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8
-	msgbox gUnknown_819A4F8, 2
+	msgbox gUnknown_819A4F8, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901
-	msgbox gUnknown_819A6B1, 2
+	msgbox gUnknown_819A6B1, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
 	lock
 	faceplayer
 	msgbox gUnknown_819A725, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E9A5
+	goto_if_eq EventScript_16E9A5
 	msgbox gUnknown_819A785
 	closemessage
 	playbgm MUS_ANNAI, 1
@@ -39,12 +39,12 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
 	setflag FLAG_SPECIAL_FLAG_0x4001
 	setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	delay 20
-	compare_var_to_value VAR_FACING, 1
+	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_16E96F
+	call_if_eq EventScript_16E96F
-	compare_var_to_value VAR_FACING, 4
+	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_16E981
+	call_if_eq EventScript_16E981
-	compare_var_to_value VAR_FACING, 3
+	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_16E993
+	call_if_eq EventScript_16E993
 	removeobject 7
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
 	clearflag FLAG_HIDE_CINNABAR_BILL
@@ -55,19 +55,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
 
 EventScript_16E96F:: @ 816E96F
 	applymovement 7, Movement_16E9AF
-	applymovement 255, Movement_16E9B9
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9
 	waitmovement 0
 	return
 
 EventScript_16E981:: @ 816E981
 	applymovement 7, Movement_16E9C3
-	applymovement 255, Movement_16E9CF
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF
 	waitmovement 0
 	return
 
 EventScript_16E993:: @ 816E993
 	applymovement 7, Movement_16E9AF
-	applymovement 255, Movement_16E9DE
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE
 	waitmovement 0
 	return
 
@@ -77,68 +77,68 @@ EventScript_16E9A5:: @ 816E9A5
 	end
 
 Movement_16E9AF:: @ 816E9AF
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1b
+	delay_8
-	step_60
+	set_invisible
 	step_end
 
 Movement_16E9B9:: @ 816E9B9
-	step_10
+	walk_down
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1c
+	delay_16
-	step_10
+	walk_down
 	step_end
 
 Movement_16E9C3:: @ 816E9C3
-	step_11
+	walk_up
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1b
+	delay_8
-	step_60
+	set_invisible
 	step_end
 
 Movement_16E9CF:: @ 816E9CF
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_1c
+	delay_16
-	step_02
+	face_left
-	step_1c
+	delay_16
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1b
+	delay_8
-	step_10
+	walk_down
-	step_1b
+	delay_8
-	step_60
+	set_invisible
 	step_end
 
 Movement_16E9DE:: @ 816E9DE
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_12
+	walk_left
-	step_10
+	walk_down
-	step_10
+	walk_down
-	step_1c
+	delay_16
-	step_10
+	walk_down
 	step_end

data/maps/CinnabarIsland_PokemonCenter_2F/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_MG_DELIVERYMEN"
     }
   ],
@@ -78,14 +78,14 @@
       "x": 5,
       "y": 1,
       "elevation": 0,
-      "dest_map": "MAP_UNKNOWN_MAP_00_04",
+      "dest_map": "MAP_UNION_ROOM",
       "dest_warp_id": 0
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
-      "dest_map": "MAP_UNKNOWN_MAP_00_01",
+      "dest_map": "MAP_TRADE_CENTER",
       "dest_warp_id": 0
     }
   ],

data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc

@@ -1,18 +1,19 @@
 CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8
-	map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
-	map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
-	map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
-	map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD
+@ The below 3 are unused and leftover from RS
-	call EventScript_1BB4A3
+CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD
+	call CableClub_EventScript_Colosseum
 	end
 
-EventScript_16EA03:: @ 816EA03
+CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03
-	call EventScript_1BB6AB
+	call CableClub_EventScript_TradeCenter
 	end
 
-EventScript_16EA09:: @ 816EA09
+CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09
-	call EventScript_1BB7DE
+	call CableClub_EventScript_RecordCorner
 	end

data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc

@@ -1,10 +1,10 @@
 CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
-	map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279
+	map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonLab_Entrance_OnTransition
 	.byte 0
 
-CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279
+CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
-	call_if eq, EventScript_16E285
+	call_if_eq EventScript_16E285
 	end
 
 EventScript_16E285:: @ 816E285
@@ -12,21 +12,21 @@ EventScript_16E285:: @ 816E285
 	return
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
-	msgbox gUnknown_8199EE5, 2
+	msgbox gUnknown_8199EE5, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294
-	msgbox gUnknown_8199F41, 3
+	msgbox gUnknown_8199F41, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D
-	msgbox gUnknown_8199F6A, 3
+	msgbox gUnknown_8199F6A, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6
-	msgbox gUnknown_8199F83, 3
+	msgbox gUnknown_8199F83, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF
-	msgbox gUnknown_8199F9A, 3
+	msgbox gUnknown_8199F9A, MSGBOX_SIGN
 	end

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc

@@ -6,17 +6,16 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
 	faceplayer
 	setvar VAR_0x8008, 8
 	call EventScript_1A8CAD
-	checkflag FLAG_DID_SEELOR_TRADE
+	goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473
-	goto_if TRUE, EventScript_16E473
 	msgbox gUnknown_81A597B, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E45B
+	goto_if_eq EventScript_16E45B
 	call EventScript_1A8CBD
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
-	goto_if ge, EventScript_16E45B
+	goto_if_ge EventScript_16E45B
 	call EventScript_1A8CC9
-	compare_var_to_var VAR_RESULT, VAR_0x8009
+	compare VAR_RESULT, VAR_0x8009
-	goto_if ne, EventScript_16E465
+	goto_if_ne EventScript_16E465
 	call EventScript_1A8CD9
 	msgbox gUnknown_81A59DA
 	setflag FLAG_DID_SEELOR_TRADE
@@ -43,48 +42,41 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
 	lock
 	faceplayer
 	setvar VAR_RESULT, 0
-	checkflag FLAG_REVIVED_AMBER
+	call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1
-	call_if TRUE, EventScript_16E8A1
+	compare VAR_RESULT, 1
-	compare_var_to_value VAR_RESULT, 1
+	goto_if_eq EventScript_16E897
-	goto_if eq, EventScript_16E897
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
+	goto_if_eq EventScript_16E736
-	goto_if eq, EventScript_16E736
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	goto_if_eq EventScript_16E72C
-	goto_if eq, EventScript_16E72C
 	call EventScript_16E4EC
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E544
+	goto_if_eq EventScript_16E544
 	call EventScript_16E504
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E586
+	goto_if_eq EventScript_16E586
 	call EventScript_16E51C
-	compare_var_to_value VAR_RESULT, 1
+	compare 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_GOT_HELIX_FOSSIL
+	goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534
-	goto_if FALSE, EventScript_16E534
+	goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534
-	checkflag FLAG_REVIVED_HELIX
-	goto_if TRUE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return
 
 EventScript_16E504:: @ 816E504
-	checkflag FLAG_GOT_DOME_FOSSIL
+	goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534
-	goto_if FALSE, EventScript_16E534
+	goto_if_set FLAG_REVIVED_DOME, EventScript_16E534
-	checkflag FLAG_REVIVED_DOME
-	goto_if TRUE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return
 
 EventScript_16E51C:: @ 816E51C
-	checkflag FLAG_GOT_OLD_AMBER
+	goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534
-	goto_if FALSE, EventScript_16E534
+	goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534
-	checkflag FLAG_REVIVED_AMBER
-	goto_if TRUE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return
 
@@ -101,8 +93,8 @@ EventScript_16E544:: @ 816E544
 	message Text_19A282
 	waitmessage
 	call EventScript_16E51C
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E5FA
+	goto_if_eq EventScript_16E5FA
 	multichoice 0, 0, MULTICHOICE_HELIX, FALSE
 	switch VAR_RESULT
 	case 0, EventScript_16E668
@@ -114,8 +106,8 @@ EventScript_16E586:: @ 816E586
 	message Text_19A282
 	waitmessage
 	call EventScript_16E51C
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E631
+	goto_if_eq EventScript_16E631
 	multichoice 0, 0, MULTICHOICE_DOME, FALSE
 	switch VAR_RESULT
 	case 0, EventScript_16E6A6
@@ -155,8 +147,8 @@ EventScript_16E668:: @ 816E668
 	getspeciesname 0, SPECIES_OMANYTE
 	getitemname 1, ITEM_HELIX_FOSSIL
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E722
+	goto_if_eq EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
 	removeitem ITEM_HELIX_FOSSIL, 1
@@ -170,8 +162,8 @@ EventScript_16E6A6:: @ 816E6A6
 	getspeciesname 0, SPECIES_KABUTO
 	getitemname 1, ITEM_DOME_FOSSIL
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E722
+	goto_if_eq EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
 	removeitem ITEM_DOME_FOSSIL, 1
@@ -185,8 +177,8 @@ EventScript_16E6E4:: @ 816E6E4
 	getspeciesname 0, SPECIES_AERODACTYL
 	getitemname 1, ITEM_OLD_AMBER
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E722
+	goto_if_eq EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
 	removeitem ITEM_OLD_AMBER, 1
@@ -207,54 +199,54 @@ EventScript_16E72C:: @ 816E72C
 	end
 
 EventScript_16E736:: @ 816E736
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
-	goto_if eq, EventScript_16E758
+	goto_if_eq EventScript_16E758
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
-	goto_if eq, EventScript_16E79D
+	goto_if_eq EventScript_16E79D
-	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
+	compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
-	goto_if eq, EventScript_16E7E2
+	goto_if_eq EventScript_16E7E2
 	end
 
 EventScript_16E758:: @ 816E758
-	setvar VAR_0x4001, SPECIES_OMANYTE
+	setvar VAR_TEMP_1, SPECIES_OMANYTE
 	getspeciesname 0, SPECIES_OMANYTE
 	msgbox gUnknown_819A34F
-	givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
+	givemon SPECIES_OMANYTE, 5, ITEM_NONE
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A927C
+	goto_if_eq EventScript_1A927C
 	setflag FLAG_REVIVED_HELIX
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16E827
+	goto_if_eq EventScript_16E827
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E85B
+	goto_if_eq EventScript_16E85B
 	end
 
 EventScript_16E79D:: @ 816E79D
-	setvar VAR_0x4001, SPECIES_KABUTO
+	setvar VAR_TEMP_1, SPECIES_KABUTO
 	getspeciesname 0, SPECIES_KABUTO
 	msgbox gUnknown_819A34F
-	givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
+	givemon SPECIES_KABUTO, 5, ITEM_NONE
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A927C
+	goto_if_eq EventScript_1A927C
 	setflag FLAG_REVIVED_DOME
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16E827
+	goto_if_eq EventScript_16E827
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E85B
+	goto_if_eq EventScript_16E85B
 	end
 
 EventScript_16E7E2:: @ 816E7E2
-	setvar VAR_0x4001, SPECIES_AERODACTYL
+	setvar VAR_TEMP_1, SPECIES_AERODACTYL
 	getspeciesname 0, SPECIES_AERODACTYL
 	msgbox gUnknown_819A34F
-	givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
+	givemon SPECIES_AERODACTYL, 5, ITEM_NONE
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A927C
+	goto_if_eq EventScript_1A927C
 	setflag FLAG_REVIVED_AMBER
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16E827
+	goto_if_eq EventScript_16E827
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16E85B
+	goto_if_eq EventScript_16E85B
 	end
 
 EventScript_16E827:: @ 816E827
@@ -265,8 +257,8 @@ EventScript_16E827:: @ 816E827
 	waitfanfare
 	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
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E895
+	goto_if_eq EventScript_16E895
 	call EventScript_1A8C27
 	call EventScript_1A74EB
 	goto EventScript_16E895
@@ -280,8 +272,8 @@ EventScript_16E85B:: @ 816E85B
 	waitfanfare
 	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
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E88A
+	goto_if_eq EventScript_16E88A
 	call EventScript_1A8C33
 	goto EventScript_16E88A
 	end
@@ -301,21 +293,17 @@ EventScript_16E897:: @ 816E897
 	end
 
 EventScript_16E8A1:: @ 816E8A1
-	checkflag FLAG_GOT_HELIX_FOSSIL
+	goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9
-	goto_if TRUE, EventScript_16E8B9
+	goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8
-	checkflag FLAG_GOT_DOME_FOSSIL
-	goto_if TRUE, EventScript_16E8C8
 	goto EventScript_16E534
 	end
 
 EventScript_16E8B9:: @ 816E8B9
-	checkflag FLAG_REVIVED_HELIX
+	goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534
-	goto_if FALSE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return
 
 EventScript_16E8C8:: @ 816E8C8
-	checkflag FLAG_REVIVED_DOME
+	goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534
-	goto_if FALSE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc

@@ -1,4 +1,4 @@
-Text_19A137:: @ 819A137
+Text_MetronomeTeach:: @ 819A137
     .string "Tch-tch-tch!\n"
     .string "I'll teach you a nifty move.\p"
     .string "Teach it to a POKéMON, and watch\n"
@@ -6,14 +6,14 @@ Text_19A137:: @ 819A137
     .string "It's a move called METRONOME.\n"
     .string "Does it strike your fancy?$"
 
-Text_19A1CB:: @ 819A1CB
+Text_MetronomeDeclined:: @ 819A1CB
     .string "I tell you, it's a lot of fun!$"
 
-Text_19A1EA:: @ 819A1EA
+Text_MetronomeWhichMon:: @ 819A1EA
     .string "Okay!\n"
     .string "Which POKéMON should I teach?$"
 
-Text_19A20E:: @ 819A20E
+Text_MetronomeTaught:: @ 819A20E
     .string "Tch-tch-tch!\n"
     .string "That's the sound of a METRONOME.\p"
     .string "It tweaks your POKéMON's brain into\n"

data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc

@@ -2,7 +2,7 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8
 	.byte 0
 
 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9
-	msgbox gUnknown_8199FB3, 2
+	msgbox gUnknown_8199FB3, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
@@ -10,17 +10,16 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
 	faceplayer
 	setvar VAR_0x8008, 6
 	call EventScript_1A8CAD
-	checkflag FLAG_DID_ESPHERE_TRADE
+	goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334
-	goto_if TRUE, EventScript_16E334
 	msgbox gUnknown_81A59FE, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E31C
+	goto_if_eq EventScript_16E31C
 	call EventScript_1A8CBD
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
-	goto_if ge, EventScript_16E31C
+	goto_if_ge EventScript_16E31C
 	call EventScript_1A8CC9
-	compare_var_to_var VAR_RESULT, VAR_0x8009
+	compare VAR_RESULT, VAR_0x8009
-	goto_if ne, EventScript_16E326
+	goto_if_ne EventScript_16E326
 	call EventScript_1A8CD9
 	msgbox gUnknown_81A5A9D
 	setflag FLAG_DID_ESPHERE_TRADE
@@ -50,21 +49,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
-	checkflag FLAG_DID_TANGENY_TRADE
+	goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4
-	goto_if TRUE, EventScript_16E3D4
 	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, NO
-	goto_if eq, EventScript_16E3BC
+	goto_if_eq EventScript_16E3BC
 	special Special_ChooseMonFromParty
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
-	goto_if ge, EventScript_16E3BC
+	goto_if_ge EventScript_16E3BC
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
-	compare_var_to_var VAR_RESULT, VAR_0x8009
+	compare VAR_RESULT, VAR_0x8009
-	goto_if ne, EventScript_16E3C6
+	goto_if_ne EventScript_16E3C6
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF",
+      "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor",
       "flag": "0"
     },
     {

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc

@@ -1,18 +1,18 @@
 CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE
 	.byte 0
 
-CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF
-	goto EventScript_1C4C8E
+	goto EventScript_MetronomeTutor
 	end
 
 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
-	msgbox gUnknown_819A015, 2
+	msgbox gUnknown_819A015, MSGBOX_NPC
 	end
 
 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE
-	msgbox gUnknown_819A04A, 3
+	msgbox gUnknown_819A04A, MSGBOX_SIGN
 	end
 
 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7
-	msgbox gUnknown_819A128, 3
+	msgbox gUnknown_819A128, MSGBOX_SIGN
 	end

data/maps/DiglettsCave_B1F/scripts.inc

@@ -1,7 +1,7 @@
 DiglettsCave_B1F_MapScripts:: @ 8160EF1
-	map_script 3, DiglettsCave_B1F_MapScript1_160EF7
+	map_script MAP_SCRIPT_ON_TRANSITION, DiglettsCave_B1F_OnTransition
 	.byte 0
 
-DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7
+DiglettsCave_B1F_OnTransition:: @ 8160EF7
 	setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F
 	end

data/maps/DiglettsCave_NorthEntrance/scripts.inc

@@ -2,5 +2,5 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7
 	.byte 0
 
 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8
-	msgbox gUnknown_817462C, 2
+	msgbox gUnknown_817462C, MSGBOX_NPC
 	end

data/maps/DiglettsCave_SouthEntrance/scripts.inc

@@ -2,5 +2,5 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB
 	.byte 0
 
 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC
-	msgbox gUnknown_81746A7, 2
+	msgbox gUnknown_81746A7, MSGBOX_NPC
 	end

data/maps/FiveIsland/scripts.inc

@@ -1,19 +1,19 @@
 FiveIsland_MapScripts:: @ 8167E8E
-	map_script 3, FiveIsland_MapScript1_167E94
+	map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_OnTransition
 	.byte 0
 
-FiveIsland_MapScript1_167E94:: @ 8167E94
+FiveIsland_OnTransition:: @ 8167E94
 	setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND
 	end
 
 FiveIsland_EventScript_167E98:: @ 8167E98
-	msgbox gUnknown_8182DFB, 3
+	msgbox gUnknown_8182DFB, MSGBOX_SIGN
 	end
 
 FiveIsland_EventScript_167EA1:: @ 8167EA1
-	msgbox gUnknown_8182E26, 2
+	msgbox gUnknown_8182E26, MSGBOX_NPC
 	end
 
 FiveIsland_EventScript_167EAA:: @ 8167EAA
-	msgbox gUnknown_8182E96, 2
+	msgbox gUnknown_8182E96, MSGBOX_NPC
 	end

data/maps/FiveIsland_Harbor/scripts.inc

@@ -4,7 +4,7 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42
 FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
 	lock
 	faceplayer
-	message Text_181726
+	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
 	goto EventScript_1A900F

data/maps/FiveIsland_House1/scripts.inc

@@ -2,5 +2,5 @@ FiveIsland_House1_MapScripts:: @ 8171D56
 	.byte 0
 
 FiveIsland_House1_EventScript_171D57:: @ 8171D57
-	msgbox gUnknown_81A3CAC, 2
+	msgbox gUnknown_81A3CAC, MSGBOX_NPC
 	end

data/maps/FiveIsland_House2/scripts.inc

@@ -2,5 +2,5 @@ FiveIsland_House2_MapScripts:: @ 8171D60
 	.byte 0
 
 FiveIsland_House2_EventScript_171D61:: @ 8171D61
-	msgbox gUnknown_81A3D5E, 2
+	msgbox gUnknown_81A3D5E, MSGBOX_NPC
 	end

data/maps/FiveIsland_LostCave_Entrance/scripts.inc

@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC
-	map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2
+	map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_LostCave_Entrance_OnTransition
 	.byte 0
 
-FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2
+FiveIsland_LostCave_Entrance_OnTransition:: @ 8164BF2
 	setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE
 	end

data/maps/FiveIsland_LostCave_Room1/scripts.inc

@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6
 	.byte 0
 
 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42
+	trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42
-	msgbox gUnknown_817CF54, 6
+	msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE
 	end

data/maps/FiveIsland_LostCave_Room10/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB",
+      "script": "FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf",
       "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF"
     }
   ],

data/maps/FiveIsland_LostCave_Room10/scripts.inc

@@ -1,18 +1,17 @@
 FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D
-	map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38
+	map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume
-	map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame
 	.byte 0
 
-FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38
+FiveIsland_LostCave_Room10_OnResume:: @ 8164C38
-	checktrainerflag TRAINER_LADY_SELPHY
+	call_if_defeated TRAINER_LADY_SELPHY, EventScript_164C42
-	call_if eq, EventScript_164C42
 	end
 
 EventScript_164C42:: @ 8164C42
 	setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1
 	return
 
-FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48
+FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48
 	map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52
 	.2byte 0
 
@@ -26,9 +25,9 @@ EventScript_164C52:: @ 8164C52
 	waitmovement 0
 	msgbox gUnknown_817D062
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
-	goto_if eq, EventScript_164CB6
+	goto_if_eq EventScript_164CB6
-	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086
+	trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086
 	msgbox gUnknown_817D0B2
 	closemessage
 	call EventScript_164CA5
@@ -51,16 +50,16 @@ EventScript_164CB6:: @ 8164CB6
 	end
 
 Movement_164CC0:: @ 8164CC0
-	step_12
+	walk_left
-	step_1c
+	delay_16
-	step_13
+	walk_right
-	step_1c
+	delay_16
-	step_2e
+	walk_in_place_fastest_up
-	step_1c
+	delay_16
-	step_2d
+	walk_in_place_fastest_down
 	step_end
 
 Movement_164CC8:: @ 8164CC8
-	step_10
+	walk_down
-	step_10
+	walk_down
 	step_end

data/maps/FiveIsland_LostCave_Room11/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8",
+      "script": "FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense",
       "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE"
     }
   ],