fixing merge conflicts

1 files changed, 1262 insertions, 1294 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index d6702745a..1c8cff8d6 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,7 +1,18 @@
+#include "constants/decorations.h"
+#include "constants/flags.h"
+#include "constants/game_stat.h"
+#include "constants/items.h"
+#include "constants/map_objects.h"
+#include "constants/maps.h"
+#include "constants/moves.h"
+#include "constants/opponents.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/weather.h"
+#include "constants/vars.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
-	.include "constants/variables.inc"
 
 	.section script_data, "aw", %progbits
 
@@ -22,12 +33,12 @@ gSpecialVars::
 	.4byte gSpecialVar_0x8009
 	.4byte gSpecialVar_0x800A
 	.4byte gSpecialVar_0x800B
-	.4byte gScriptFacing
-	.4byte gScriptResult
-	.4byte gScriptItemId
-	.4byte gScriptLastTalked
-	.4byte gScriptContestRank
-	.4byte gScriptContestCategory
+	.4byte gSpecialVar_Facing
+	.4byte gSpecialVar_Result
+	.4byte gSpecialVar_ItemId
+	.4byte gSpecialVar_LastTalked
+	.4byte gSpecialVar_ContestRank
+	.4byte gSpecialVar_ContestCategory
 
 	.include "data/specials.inc"
 
@@ -386,27 +397,26 @@ gStdScripts_End::
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
-	playsfx 2
+	playse SE_PC_LOGON
 	message UnknownString_81A3A72
-	doanimation 61
+	dofieldeffect 61
 	waitstate
-	waittext
-	waitbutton
-	playsfx 5
-	jump EventScript_15F384
+	waitmessage
+	waitbuttonpress
+	playse SE_SELECT
+	goto EventScript_15F384
 	end
 
 EventScript_15F384:
 	message UnknownString_81A3A87
-	waittext
-	checkflag 268
-	jumpeq EventScript_15F3A0
-	jump EventScript_15F3E2
+	waitmessage
+	goto_if_set FLAG_DECORATION_16, EventScript_15F3A0
+	goto EventScript_15F3E2
 	end
 
 gUnknown_0815F399:: @ 815F399
 	lockall
-	jump EventScript_15F384
+	goto EventScript_15F384
 	end
 
 EventScript_15F3A0:
@@ -429,10 +439,10 @@ EventScript_15F3E2:
 	end
 
 EventScript_15F419:
-	msgbox UnknownString_81A38FB, 5
-	compare RESULT, 0
-	jumpeq EventScript_15F384
-	closebutton
+	msgbox UnknownString_81A38FB, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_15F384
+	closemessage
 	special SecretBasePC_PackUp
 	releaseall
 	end
@@ -448,18 +458,18 @@ EventScript_15F436:
 gUnknown_0815F43A:: @ 815F43A
 	lockall
 	message UnknownString_81A3A72
-	playsfx 2
-	doanimation 61
+	playse SE_PC_LOGON
+	dofieldeffect 61
 	waitstate
-	waittext
-	waitbutton
-	playsfx 5
-	jump EventScript_15F452
+	waitmessage
+	waitbuttonpress
+	playse SE_SELECT
+	goto EventScript_15F452
 	end
 
 EventScript_15F452:
 	message UnknownString_81A3A87
-	waittext
+	waitmessage
 	multichoice 0, 0, 7, 0
 	switch RESULT
 	case 0, EventScript_15F4A1
@@ -471,69 +481,69 @@ EventScript_15F452:
 
 gUnknown_0815F49A:: @ 815F49A
 	lockall
-	jump EventScript_15F452
+	goto EventScript_15F452
 	end
 
 EventScript_15F4A1:
 	special sub_80BC56C
 	compare RESULT, 1
-	jumpeq EventScript_15F4E0
+	goto_if_eq EventScript_15F4E0
 	compare RESULT, 2
-	jumpeq EventScript_15F503
-	special sub_80BC224
-	msgbox UnknownString_81A3958, 5
-	compare RESULT, 0
-	jumpeq EventScript_15F452
+	goto_if_eq EventScript_15F503
+	special BufferSecretBaseOwnerName
+	msgbox UnknownString_81A3958, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_15F452
 	msgbox UnknownString_81A3A22, 3
 	special sub_80BC5BC
-	special sub_80C683C
+	special DoSecretBasePCTurnOffEffect
 	releaseall
 	end
 
 EventScript_15F4E0:
-	msgbox UnknownString_81A3982, 5
-	compare RESULT, 0
-	jumpeq EventScript_15F452
+	msgbox UnknownString_81A3982, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_15F452
 	msgbox UnknownString_81A3A3A, 3
 	special sub_80BC5BC
-	special sub_80C683C
+	special DoSecretBasePCTurnOffEffect
 	releaseall
 	end
 
 EventScript_15F503:
 	msgbox UnknownString_81A39C0, 3
-	special sub_80C683C
-	closebutton
+	special DoSecretBasePCTurnOffEffect
+	closemessage
 	releaseall
 	end
 
 EventScript_15F511:
 	message UnknownString_81A3AA2
-	waittext
-	jump EventScript_15F452
+	waitmessage
+	goto EventScript_15F452
 	end
 
 EventScript_15F51D:
-	special sub_80C683C
-	closebutton
+	special DoSecretBasePCTurnOffEffect
+	closemessage
 	releaseall
 	end
 
 gUnknown_0815F523:: @ 815F523
-	doanimation 52
+	dofieldeffect 52
 	waitstate
 	end
 
 gUnknown_0815F528:: @ 815F528
 	special GetShieldToyTVDecorationInfo
 	compare RESULT, 0
-	jumpeq EventScript_15F558
+	goto_if_eq EventScript_15F558
 	compare RESULT, 1
-	jumpeq EventScript_15F561
+	goto_if_eq EventScript_15F561
 	compare RESULT, 2
-	jumpeq EventScript_15F56A
+	goto_if_eq EventScript_15F56A
 	compare RESULT, 3
-	jumpeq EventScript_15F573
+	goto_if_eq EventScript_15F573
 	end
 
 EventScript_15F558:
@@ -890,145 +900,140 @@ Std_2:
 	lock
 	faceplayer
 	message 0x0
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	release
 	return
 
 Std_3:
 	lockall
 	message 0x0
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	releaseall
 	return
 
 Std_4:
 	message 0x0
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	return
 
 Std_5:
 	message 0x0
-	waittext
+	waitmessage
 	yesnobox 20, 8
 	return
 
 @ 819F805
 	return
 
-BattleTower_Lobby_EventScript_19F806:: @ 819F806
-FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
-LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
-MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
-OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
-SecretBase_RedCave1_EventScript_19F806:: @ 819F806
-	special InitSaveDialog
+S_DoSaveDialog:: @ 819F806
+	special ScrSpecial_DoSaveDialog
 	waitstate
 	return
 
 gUnknown_0819F80B:: @ 819F80B
 	lock
 	special PlayTrainerEncounterMusic
-	special sub_80847C8
+	special ScrSpecial_EndTrainerApproach
 	waitstate
-	jump EventScript_19F8F2
+	goto EventScript_19F8F2
 
 gUnknown_0819F818:: @ 819F818
 	lock
 	faceplayer
-	move LAST_TALKED, Movement_19F8F0
-	waitmove 0
-	specialval RESULT, sub_8082564
+	applymovement LAST_TALKED, Movement_19F8F0
+	waitmovement 0
+	specialvar RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
-	jumpif 5, EventScript_19F83F
+	goto_if_ne EventScript_19F83F
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	jump EventScript_19F8F2
+	goto EventScript_19F8F2
 
 EventScript_19F83F:
-	endtrainerbattle
+	gotopostbattlescript
 
 gUnknown_0819F840:: @ 819F840
 	lock
 	faceplayer
 	call EventScript_19F8E5
-	specialval RESULT, sub_8082564
+	specialvar RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
-	jumpif 5, EventScript_19F877
+	goto_if_ne EventScript_19F877
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	jumpif 5, EventScript_19F870
+	goto_if_ne EventScript_19F870
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	jump EventScript_19F8F2
+	goto EventScript_19F8F2
 
 EventScript_19F870:
-	special sub_8082718
-	waittext
-	waitbutton
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
+	waitmessage
+	waitbuttonpress
 	release
 	end
 
 EventScript_19F877:
-	endtrainerbattle
+	gotopostbattlescript
 
 gUnknown_0819F878:: @ 819F878
-	move LAST_TALKED, Movement_19F8F0
-	waitmove 0
+	applymovement LAST_TALKED, Movement_19F8F0
+	waitmovement 0
 	special PlayTrainerEncounterMusic
-	reptrainerbattle
-	endtrainerbattle
+	trainerbattlebegin
+	gotopostbattlescript
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
-	specialval RESULT, sub_8082C9C
+	specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare RESULT, 0
-	jumpeq EventScript_19F8AD
+	goto_if_eq EventScript_19F8AD
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	special sub_80826D8
-	waittext
-	waitbutton
-	special sub_80826B0
+	special ScrSpecial_ShowTrainerIntroSpeech
+	waitmessage
+	waitbuttonpress
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
 
 EventScript_19F8AD:
-	endtrainerbattle
+	gotopostbattlescript
 
 gUnknown_0819F8AE:: @ 819F8AE
-	specialval RESULT, sub_8082C9C
+	specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare RESULT, 0
-	jumpeq EventScript_19F8DD
+	goto_if_eq EventScript_19F8DD
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	jumpif 5, EventScript_19F8DE
+	goto_if_ne EventScript_19F8DE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	special sub_80826D8
-	waittext
-	waitbutton
-	special sub_80826B0
+	special ScrSpecial_ShowTrainerIntroSpeech
+	waitmessage
+	waitbuttonpress
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
 
 EventScript_19F8DD:
-	endtrainerbattle
+	gotopostbattlescript
 
 EventScript_19F8DE:
-	special sub_8082718
-	waittext
-	waitbutton
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
+	waitmessage
+	waitbuttonpress
 	release
 	end
 
 EventScript_19F8E5:
-	move LAST_TALKED, Movement_19F8F0
-	waitmove 0
+	applymovement LAST_TALKED, Movement_19F8F0
+	waitmovement 0
 	return
 
 Movement_19F8F0::
@@ -1036,356 +1041,350 @@ Movement_19F8F0::
 	step_end
 
 EventScript_19F8F2:
-	special sub_80826D8
-	waittext
-	waitbutton
-	reptrainerbattle
-	specialval RESULT, sub_8082558
+	special ScrSpecial_ShowTrainerIntroSpeech
+	waitmessage
+	waitbuttonpress
+	trainerbattlebegin
+	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
-	jumpeq EventScript_19F934
+	goto_if_eq EventScript_19F934
 	compare RESULT, 2
-	jumpeq EventScript_19F936
+	goto_if_eq EventScript_19F936
 	compare RESULT, 1
-	jumpeq EventScript_19F936
+	goto_if_eq EventScript_19F936
 	compare RESULT, 6
-	jumpeq EventScript_19F936
+	goto_if_eq EventScript_19F936
 	compare RESULT, 8
-	jumpeq EventScript_19F936
+	goto_if_eq EventScript_19F936
 
 EventScript_19F934:
 	releaseall
 	end
 
 EventScript_19F936:
-	endtrainerbattle2
+	gotobeatenscript
 
 Std_6::
 	message 0x0
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	release
 	return
 
 Event_ResetBerryTrees: @ 19F940
-	event_8a 2, 7, 5
-	event_8a 1, 3, 5
-	event_8a 11, 7, 5
-	event_8a 13, 3, 5
-	event_8a 4, 7, 5
-	event_8a 76, 1, 5
-	event_8a 8, 1, 5
-	event_8a 10, 6, 5
-	event_8a 25, 20, 5
-	event_8a 26, 2, 5
-	event_8a 66, 2, 5
-	event_8a 67, 20, 5
-	event_8a 69, 22, 5
-	event_8a 70, 22, 5
-	event_8a 71, 22, 5
-	event_8a 55, 17, 5
-	event_8a 56, 17, 5
-	event_8a 5, 1, 5
-	event_8a 6, 6, 5
-	event_8a 7, 1, 5
-	event_8a 16, 18, 5
-	event_8a 17, 18, 5
-	event_8a 18, 18, 5
-	event_8a 29, 19, 5
-	event_8a 28, 19, 5
-	event_8a 27, 19, 5
-	event_8a 24, 4, 5
-	event_8a 23, 3, 5
-	event_8a 22, 3, 5
-	event_8a 21, 4, 5
-	event_8a 19, 16, 5
-	event_8a 20, 16, 5
-	event_8a 80, 7, 5
-	event_8a 81, 7, 5
-	event_8a 77, 8, 5
-	event_8a 78, 8, 5
-	event_8a 68, 8, 5
-	event_8a 31, 10, 5
-	event_8a 33, 10, 5
-	event_8a 34, 21, 5
-	event_8a 35, 21, 5
-	event_8a 36, 21, 5
-	event_8a 83, 24, 5
-	event_8a 84, 24, 5
-	event_8a 85, 10, 5
-	event_8a 86, 6, 5
-	event_8a 37, 5, 5
-	event_8a 38, 5, 5
-	event_8a 39, 5, 5
-	event_8a 40, 3, 5
-	event_8a 41, 3, 5
-	event_8a 42, 3, 5
-	event_8a 46, 19, 5
-	event_8a 45, 20, 5
-	event_8a 44, 18, 5
-	event_8a 43, 16, 5
-	event_8a 47, 8, 5
-	event_8a 48, 5, 5
-	event_8a 49, 4, 5
-	event_8a 50, 2, 5
-	event_8a 52, 18, 5
-	event_8a 53, 18, 5
-	event_8a 62, 6, 5
-	event_8a 64, 6, 5
-	event_8a 58, 21, 5
-	event_8a 59, 21, 5
-	event_8a 60, 25, 5
-	event_8a 61, 25, 5
-	event_8a 79, 23, 5
-	event_8a 14, 23, 5
-	event_8a 15, 21, 5
-	event_8a 30, 21, 5
-	event_8a 65, 25, 5
-	event_8a 72, 25, 5
-	event_8a 73, 23, 5
-	event_8a 74, 23, 5
-	event_8a 87, 3, 5
-	event_8a 88, 10, 5
-	event_8a 89, 4, 5
-	event_8a 82, 36, 5
+	setberrytree 2, 7, 5
+	setberrytree 1, 3, 5
+	setberrytree 11, 7, 5
+	setberrytree 13, 3, 5
+	setberrytree 4, 7, 5
+	setberrytree 76, 1, 5
+	setberrytree 8, 1, 5
+	setberrytree 10, 6, 5
+	setberrytree 25, 20, 5
+	setberrytree 26, 2, 5
+	setberrytree 66, 2, 5
+	setberrytree 67, 20, 5
+	setberrytree 69, 22, 5
+	setberrytree 70, 22, 5
+	setberrytree 71, 22, 5
+	setberrytree 55, 17, 5
+	setberrytree 56, 17, 5
+	setberrytree 5, 1, 5
+	setberrytree 6, 6, 5
+	setberrytree 7, 1, 5
+	setberrytree 16, 18, 5
+	setberrytree 17, 18, 5
+	setberrytree 18, 18, 5
+	setberrytree 29, 19, 5
+	setberrytree 28, 19, 5
+	setberrytree 27, 19, 5
+	setberrytree 24, 4, 5
+	setberrytree 23, 3, 5
+	setberrytree 22, 3, 5
+	setberrytree 21, 4, 5
+	setberrytree 19, 16, 5
+	setberrytree 20, 16, 5
+	setberrytree 80, 7, 5
+	setberrytree 81, 7, 5
+	setberrytree 77, 8, 5
+	setberrytree 78, 8, 5
+	setberrytree 68, 8, 5
+	setberrytree 31, 10, 5
+	setberrytree 33, 10, 5
+	setberrytree 34, 21, 5
+	setberrytree 35, 21, 5
+	setberrytree 36, 21, 5
+	setberrytree 83, 24, 5
+	setberrytree 84, 24, 5
+	setberrytree 85, 10, 5
+	setberrytree 86, 6, 5
+	setberrytree 37, 5, 5
+	setberrytree 38, 5, 5
+	setberrytree 39, 5, 5
+	setberrytree 40, 3, 5
+	setberrytree 41, 3, 5
+	setberrytree 42, 3, 5
+	setberrytree 46, 19, 5
+	setberrytree 45, 20, 5
+	setberrytree 44, 18, 5
+	setberrytree 43, 16, 5
+	setberrytree 47, 8, 5
+	setberrytree 48, 5, 5
+	setberrytree 49, 4, 5
+	setberrytree 50, 2, 5
+	setberrytree 52, 18, 5
+	setberrytree 53, 18, 5
+	setberrytree 62, 6, 5
+	setberrytree 64, 6, 5
+	setberrytree 58, 21, 5
+	setberrytree 59, 21, 5
+	setberrytree 60, 25, 5
+	setberrytree 61, 25, 5
+	setberrytree 79, 23, 5
+	setberrytree 14, 23, 5
+	setberrytree 15, 21, 5
+	setberrytree 30, 21, 5
+	setberrytree 65, 25, 5
+	setberrytree 72, 25, 5
+	setberrytree 73, 23, 5
+	setberrytree 74, 23, 5
+	setberrytree 87, 3, 5
+	setberrytree 88, 10, 5
+	setberrytree 89, 4, 5
+	setberrytree 82, 36, 5
 	return
 
 gUnknown_0819FA81:: @ 819FA81
-	setflag 86
-	setflag 769
-	setflag 770
-	setflag 771
-	setflag 721
-	setflag 889
-	setflag 726
-	setflag 867
-	setflag 731
-	setflag 732
-	setflag 814
-	setflag 868
-	setflag 739
-	setflag 881
-	setflag 738
-	setflag 740
-	setflag 741
-	setflag 743
-	setflag 744
-	setflag 906
-	setflag 737
-	setflag 747
-	setflag 748
-	setflag 749
-	setflag 756
-	setflag 774
-	setflag 895
-	setflag 776
-	setflag 777
-	setflag 778
-	setflag 779
-	setflag 780
-	setflag 781
-	setflag 782
-	setflag 783
-	setflag 734
-	setflag 849
-	setflag 789
-	setflag 790
-	setflag 791
-	setflag 792
-	setflag 797
-	setflag 798
-	setflag 799
-	setflag 901
-	setflag 902
-	setflag 903
-	setflag 904
-	setflag 800
-	setflag 801
-	setflag 803
-	setflag 802
-	setflag 806
-	setflag 808
-	setflag 809
-	setflag 984
-	setflag 811
-	setflag 812
-	setflag 866
-	setflag 815
-	setflag 816
-	setflag 869
-	setflag 823
-	setflag 828
-	setflag 829
-	setflag 831
-	setflag 859
-	setflag 841
-	setflag 843
-	setflag 844
-	setflag 847
-	setflag 845
-	setflag 846
-	setflag 860
-	setflag 861
-	setflag 835
-	setflag 840
-	setflag 848
-	setflag 851
-	setflag 855
-	setflag 856
-	setflag 973
-	setflag 870
-	setflag 872
-	setflag 877
-	setflag 879
-	setflag 891
-	setflag 880
-	setflag 878
-	setflag 807
-	setflag 983
-	setflag 886
-	setflag 884
-	setflag 885
-	setflag 961
-	setflag 888
-	setflag 941
-	setflag 752
-	setflag 757
-	setflag 892
-	setflag 896
-	setflag 897
-	setflag 898
-	setflag 909
-	setflag 910
-	setflag 911
-	setflag 915
-	setflag 912
-	setflag 920
-	setflag 921
-	setflag 922
-	setflag 923
-	setflag 925
-	setflag 929
-	setflag 930
-	setflag 934
-	setflag 939
-	setflag 940
-	setflag 928
-	setflag 834
-	setflag 944
-	setflag 945
-	setflag 947
-	setflag 948
-	setflag 858
-	setflag 950
-	setflag 968
-	setflag 1133
-	setflag 727
-	setflag 979
-	setflag 751
-	setflag 991
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	setflag FLAG_UNKNOWN_363
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
+	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	setflag FLAG_UNKNOWN_2E1
+	setflag FLAG_UNKNOWN_2EB
+	setflag FLAG_UNKNOWN_2EC
+	setflag FLAG_UNKNOWN_2ED
+	setflag FLAG_UNKNOWN_2F4
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
+	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_UNKNOWN_30E
+	setflag FLAG_UNKNOWN_30F
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
+	setflag FLAG_HIDE_MAY_PICHU_DOLL
+	setflag FLAG_HIDE_FANCLUB_OLD_LADY
+	setflag FLAG_HIDE_FANCLUB_BOY
+	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
+	setflag FLAG_HIDE_FANCLUB_LADY
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	setflag FLAG_UNKNOWN_337
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	setflag FLAG_UNKNOWN_34B
+	setflag FLAG_UNKNOWN_34C
+	setflag FLAG_UNKNOWN_34F
+	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setflag FLAG_HIDE_STERN_SLATEPORT
+	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_RIVAL_ROUTE119
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setflag FLAG_HIDE_LANETTE
+	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
+	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setflag FLAG_HIDE_MOM_UPSTAIRS
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_UNKNOWN_393
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
+	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
+	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_STEVEN_ROUTE128
+	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
+	setflag FLAG_HIDE_STEVENS_LETTER
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	setflag FLAG_HIDE_BOY_ROUTE101
 	call Event_ResetBerryTrees
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
-	clearflag 925
+	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
-	setflag 869
-	clearflag 950
-	clearflag 727
-	setvar 0x40c6, 1
-	clearflag 751
-	clearflag 860
-	clearflag 861
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	clearflag FLAG_HIDE_STEVENS_LETTER
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
 	special sub_810FAA0
-	checkflag 291
-	callif 0, EverGrandeCity_HallOfFame_EventScript_19FC62
-	checkflag 255
-	callif 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag 298
-	callif 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	checkflag 123
-	callif 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
+	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62
+	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70
+	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A
+	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
-	clearflag 968
+	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
-	clearflag 1133
+	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
-	setvar 0x4082, 3
-	setvar 0x408c, 3
-	clearflag 734
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
-	setflag 2141
+	setflag FLAG_SYS_TV_LATI
 	return
 
-EventScript_LeagueWhiteOut:: @ 819FC74
+S_WhiteOut:: @ 819FC74
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
 	call EventScript_19FC84
-	jump gUnknown_0819FC9F
+	goto gUnknown_0819FC9F
 	end
 
 EventScript_19FC84:
-	checkflag 221
-	jumpeq Route101_EventScript_1A14DC
-	checkflag 1213
-	jumpif 0, Route101_EventScript_1A14DC
-	clearflag 929
-	setvar 0x4053, 2
+	goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC
+	goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC
+	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
 	return
 
 gUnknown_0819FC9F:: @ 819FC9F
-	compare 0x4096, 1
-	jumpeq EventScript_19FCC1
-	compare 0x4096, 2
-	jumpeq EventScript_19FCD7
-	compare 0x4096, 3
-	jumpeq EventScript_19FCF0
+	compare VAR_BRINEY_LOCATION, 1
+	goto_if_eq EventScript_19FCC1
+	compare VAR_BRINEY_LOCATION, 2
+	goto_if_eq EventScript_19FCD7
+	compare VAR_BRINEY_LOCATION, 3
+	goto_if_eq EventScript_19FCF0
 	end
 
 EventScript_19FCC1:
-	setflag 740
-	setflag 743
-	setflag 741
-	setflag 744
-	clearflag 742
-	clearflag 739
-	clearflag 881
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	end
 
 EventScript_19FCD7:
-	setflag 741
-	setflag 744
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	clearflag 740
-	clearflag 743
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	end
 
 EventScript_19FCF0:
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	setflag 740
-	setflag 743
-	clearflag 741
-	clearflag 744
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
-	clearflag 1245
-	clearflag 1246
-	clearflag 1247
-	clearflag 1248
-	setvar 0x409c, 0
+	clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
+	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
+	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
+	clearflag FLAG_DEFEATED_ELITE_4_DRAKE
+	setvar VAR_ELITE_4_STATE, 0
 	return
 
 DewfordTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
@@ -1397,28 +1396,23 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-	checkflag 188
-	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 1217
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 742
-	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
-	checkflag 740
-	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
-	checkflag 741
-	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
+	goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+	goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49
+	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
+	goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49
-	setvar 0x4096, 1
+	setvar VAR_BRINEY_LOCATION, 1
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FD4F:: @ 819FD4F
-	setvar 0x4096, 2
+	setvar VAR_BRINEY_LOCATION, 2
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FD55:: @ 819FD55
-	setvar 0x4096, 3
+	setvar VAR_BRINEY_LOCATION, 3
 	return
 
 DewfordTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
@@ -1437,55 +1431,54 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 	lock
 	faceplayer
-	msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
-	compare RESULT, 1
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
-	compare RESULT, 0
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
-	end
-
-OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
-	inccounter GAME_STAT_USED_POKECENTER
-	message OldaleTown_PokemonCenter_1F_Text_1A1245
-	waittext
-	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
-	waitmove 0
-	doanimation 25
-	checkanimation 25
-	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
-	waitmove 0
-	special HealPlayerParty
-	checkflag 273
-	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
-	jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
+	msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq do_heal_party
+	compare RESULT, NO
+	goto_if_eq dont_heal_party
+	end
+
+do_heal_party:: @ 819FD7C
+	incrementgamestat GAME_STAT_USED_POKECENTER
+	message gText_NurseJoy_OkayIllTakeYourPokemon
+	waitmessage
+	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A083F
+	waitmovement 0
+	dofieldeffect 25
+	waitfieldeffect 25
+	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845
+	waitmovement 0
+	special ScrSpecial_HealPlayerParty
+	goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
+	goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
-	message OldaleTown_PokemonCenter_1F_Text_1A0B14
-	waittext
-	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
-	waitmove 0
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
-	waittext
+	message gText_NurseJoy_ThankYouForWaiting
+	waitmessage
+	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4
+	waitmovement 0
+	message gText_NurseJoy_WeHopeToSeeYouAgain
+	waitmessage
 	return
 
-OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
-	waittext
+dont_heal_party:: @ 819FDC7
+	message gText_NurseJoy_WeHopeToSeeYouAgain
+	waitmessage
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
-	specialval RESULT, IsPokerusInParty
+	specialvar RESULT, IsPokerusInParty
 	compare RESULT, 1
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDEA
+	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA
 	compare RESULT, 0
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDB0
+	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
-	message OldaleTown_PokemonCenter_1F_Text_1A1275
-	waittext
-	setflag 273
+	message gText_NurseJoy_Pokerus
+	waitmessage
+	setflag FLAG_POKERUS_EXPLAINED
 	return
 
 OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
@@ -1494,19 +1487,19 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
 	step_end
 
 Std_ObtainItem: @ 819FDF7
-	additem 0x8000, 0x8001
-	copyvar 0x8007, RESULT
+	giveitem VAR_SPECIAL_0, VAR_SPECIAL_1
+	copyvar VAR_SPECIAL_7, RESULT
 	call Std_ObtainItem_
 	return
 
 Std_ObtainItem_: @ 819FE07
-	bufferitem 1, 0x8000
-	checkitemtype 0x8000
+	bufferitemname 1, VAR_SPECIAL_0
+	checkitemtype VAR_SPECIAL_0
 	call GetItem_HandlePocket
-	compare 0x8007, 0x1
-	callif 1, Std_ObtainItem_Success
-	compare 0x8007, 0x0
-	callif 1, Std_ObtainItem_Fail
+	compare VAR_SPECIAL_7, 0x1
+	call_if_eq Std_ObtainItem_Success
+	compare VAR_SPECIAL_7, 0x0
+	call_if_eq Std_ObtainItem_Fail
 	return
 
 GetItem_HandlePocket:
@@ -1519,39 +1512,39 @@ GetItem_HandlePocket:
 	end
 
 GetItem_HandlePocket_Items:
-	bufferstd 2, 0xE
-	compare 0x8007, 1
-	callif 1, PlayGetItemFanfare
+	bufferstdstring 2, 0xE
+	compare VAR_SPECIAL_7, 1
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_KeyItems:
-	bufferstd 2, 0xF
-	compare 0x8007, 1
-	callif 1, PlayGetItemFanfare
+	bufferstdstring 2, 0xF
+	compare VAR_SPECIAL_7, 1
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_PokeBalls:
-	bufferstd 2, 0x10
-	compare 0x8007, 1
-	callif 1, PlayGetItemFanfare
+	bufferstdstring 2, 0x10
+	compare VAR_SPECIAL_7, 1
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_TMsHMs:
-	bufferstd 2, 0x11
-	compare 0x8007, 1
-	callif 1, PlayGetTMHMFanfare
+	bufferstdstring 2, 0x11
+	compare VAR_SPECIAL_7, 1
+	call_if_eq PlayGetTMHMFanfare
 	return
 
 GetItem_HandlePocket_Berries:
-	bufferstd 2, 0x12
-	compare 0x8007, 1
-	callif 1, PlayGetItemFanfare
+	bufferstdstring 2, 0x12
+	compare VAR_SPECIAL_7, 1
+	call_if_eq PlayGetItemFanfare
 	return
 
 Std_ObtainItem_Success: @ 819FEB7
 	message Message_ObtainedItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	setvar RESULT, 1
 	return
@@ -1561,32 +1554,32 @@ Std_ObtainItem_Fail: @ 819FECC
 	return
 
 PlayGetItemFanfare:
-	fanfare 0x172
+	playfanfare BGM_FANFA4
 	return
 
 PlayGetTMHMFanfare:
-	fanfare 0x174
+	playfanfare BGM_ME_WAZA
 	return
 
 Std_ObtainDecoration: @ 819FEDA
-	adddecor 0x8000
-	copyvar 0x8007, RESULT
+	givedecoration VAR_SPECIAL_0
+	copyvar VAR_SPECIAL_7, RESULT
 	call Std_ObtainDecoration_
 	return
 
 Std_ObtainDecoration_: @ 819FEE8
-	bufferdecor 1, 0x8000
-	compare 0x8007, 1
-	callif 1, Std_ObtainDecoration_Success
-	compare 0x8007, 0
-	callif 1, Std_ObtainDecoration_Fail
+	bufferdecorationname 1, VAR_SPECIAL_0
+	compare VAR_SPECIAL_7, 1
+	call_if_eq Std_ObtainDecoration_Success
+	compare VAR_SPECIAL_7, 0
+	call_if_eq Std_ObtainDecoration_Fail
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
-	fanfare 0x172
+	playfanfare BGM_FANFA4
 	message Message_ObtainedDecoration
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_TransferredToPC
 	setvar RESULT, 1
 	return
@@ -1598,24 +1591,24 @@ Std_ObtainDecoration_Fail: @ 819FF1B
 Std_FindItem: @ 819FF21
 	lock
 	faceplayer
-	checksound
-	additem 0x8000, 0x8001
-	copyvar 0x8007, RESULT
-	bufferitem 1, 0x8000
-	checkitemtype 0x8000
+	waitse
+	giveitem VAR_SPECIAL_0, VAR_SPECIAL_1
+	copyvar VAR_SPECIAL_7, RESULT
+	bufferitemname 1, VAR_SPECIAL_0
+	checkitemtype VAR_SPECIAL_0
 	call GetItem_HandlePocket
-	compare 0x8007, 1
-	callif 1, Std_FindItem_Success
-	compare 0x8007, 0
-	callif 1, Std_FindItem_Fail
+	compare VAR_SPECIAL_7, 1
+	call_if_eq Std_FindItem_Success
+	compare VAR_SPECIAL_7, 0
+	call_if_eq Std_FindItem_Fail
 	release
 	return
 
 Std_FindItem_Success: @ 819FF52
-	disappear LAST_TALKED
+	removeobject LAST_TALKED
 	message Message_FoundOneItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	return
 
@@ -1627,22 +1620,22 @@ Std_FindItem_Fail: @ 819FF65
 
 HiddenItemScript:: @ 819FF7B
 	lockall
-	checksound
-	additem 0x8005, 1
-	copyvar 0x8007, RESULT
-	bufferitem 0x1, 0x8005
-	checkitemtype 0x8005
+	waitse
+	giveitem VAR_SPECIAL_5, 1
+	copyvar VAR_SPECIAL_7, RESULT
+	bufferitemname 0x1, VAR_SPECIAL_5
+	checkitemtype VAR_SPECIAL_5
 	call GetItem_HandlePocket
-	compare 0x8007, 1
-	jumpeq HiddenItemScript_Success
-	compare 0x8007, 0
-	jumpeq HiddenItemScript_Fail
+	compare VAR_SPECIAL_7, 1
+	goto_if_eq HiddenItemScript_Success
+	compare VAR_SPECIAL_7, 0
+	goto_if_eq HiddenItemScript_Fail
 	end
 
 HiddenItemScript_Success:
 	message Message_FoundOneItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	special SetFlagInVar
 	releaseall
@@ -1658,12 +1651,12 @@ HiddenItemScript_Fail:
 UnusedMixRecordsScript: @ 819FFD5
 	lock
 	faceplayer
-	msgbox UnusedMixRecordsPromptText, 5
-	compare RESULT, 1
-	jumpeq UnusedMixRecordsScript_Yes
-	compare RESULT, 0
-	jumpeq UnusedMixRecordsScript_Done
-	jump UnusedMixRecordsScript_Done
+	msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq UnusedMixRecordsScript_Yes
+	compare RESULT, NO
+	goto_if_eq UnusedMixRecordsScript_Done
+	goto UnusedMixRecordsScript_Done
 UnusedMixRecordsScript_Yes: @ 819FFFA
 	special sub_80B929C
 	waitstate
@@ -1671,26 +1664,26 @@ UnusedMixRecordsScript_Yes: @ 819FFFA
 	faceplayer
 UnusedMixRecordsScript_Done: @ 81A0000
 	message UnusedMixRecordsSeeYouAgainText
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	release
 	end
 
 gUnknown_081A0009:: @ 81A0009
 	lockall
-	setvar 0x8004, 0
+	setvar VAR_SPECIAL_4, 0
 	special DoPCTurnOnEffect
-	playsfx 4
+	playse SE_PC_ON
 	msgbox UnknownString_81A09EC, 4
-	jump EventScript_1A0023
+	goto EventScript_1A0023
 	end
 
 EventScript_1A0023:
 	message gPCText_WhichPCShouldBeAccessed
-	waittext
-	special TryCreatePCMenu
+	waitmessage
+	special ScrSpecial_CreatePCMenu
 	waitstate
-	jump EventScript_1A0033
+	goto EventScript_1A0033
 	end
 
 EventScript_1A0033:
@@ -1703,23 +1696,21 @@ EventScript_1A0033:
 	end
 
 EventScript_1A0070:
-	playsfx 2
+	playse SE_PC_LOGON
 	msgbox UnknownString_81A0A54, 4
 	special PlayerPC
 	waitstate
-	jump EventScript_1A0023
+	goto EventScript_1A0023
 	end
 
 EventScript_1A0085:
-	playsfx 2
-	checkflag 2123
-	callif 0, EventScript_1A00AC
-	checkflag 2123
-	callif 1, EventScript_1A00B5
+	playse SE_PC_LOGON
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
 	waitstate
-	jump EventScript_1A0023
+	goto EventScript_1A0023
 	end
 
 EventScript_1A00AC:
@@ -1731,19 +1722,18 @@ EventScript_1A00B5:
 	return
 
 EventScript_1A00BE:
-	setvar 0x8004, 0
-	playsfx 3
+	setvar VAR_SPECIAL_4, 0
+	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
 EventScript_1A00CB:
-	checkflag 2052
-	jumpif 0, EventScript_1A00BE
-	playsfx 2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE
+	playse SE_PC_LOGON
 	special AccessHallOfFamePC
 	waitstate
-	jump EventScript_1A0033
+	goto EventScript_1A0033
 	end
 
 FallarborTown_EventScript_1A00E1:: @ 81A00E1
@@ -1796,36 +1786,36 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB
 LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB
 MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB
 RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
-	clearflag 781
-	setflag 296
+	clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
 DewfordTown_EventScript_1A0102:: @ 81A0102
 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102
-	checkdailyflags
-	setvar 0x8004, 0
-	special sub_80FA5BC
+	dodailyevents
+	setvar VAR_SPECIAL_4, 0
+	special BufferTrendyPhraseString
 	return
 
 DewfordTown_EventScript_1A010C:: @ 81A010C
 Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C
 Route109_EventScript_1A010C:: @ 81A010C
-	copyvar 0x8008, 0x4096
-	setvar 0x4096, 0
+	copyvar VAR_SPECIAL_8, VAR_BRINEY_LOCATION
+	setvar VAR_BRINEY_LOCATION, 0
 	return
 
 UseSurfScript:: @ 81A0117
-	checkattack MOVE_SURF
+	checkpartymove MOVE_SURF
 	compare RESULT, 6
-	jumpeq UseSurfScript_NoMon
-	bufferpartypoke 0, RESULT
-	setanimation 0, RESULT
+	goto_if_eq UseSurfScript_NoMon
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
 	lockall
-	msgbox UseSurfPromptText, 5
-	compare RESULT, 0
-	jumpeq UseSurfScript_No
+	msgbox UseSurfPromptText, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq UseSurfScript_No
 	msgbox UsedSurfText, 4
-	doanimation 9
+	dofieldeffect 9
 UseSurfScript_No: @ 81A014C
 	releaseall
 UseSurfScript_NoMon: @ 81A014D
@@ -1840,37 +1830,37 @@ Route103_EventScript_1A014E:: @ 81A014E
 Route110_EventScript_1A014E:: @ 81A014E
 Route119_EventScript_1A014E:: @ 81A014E
 RustboroCity_EventScript_1A014E:: @ 81A014E
-	checkgender
+	checkplayergender
 	compare RESULT, 0
-	jumpeq RustboroCity_EventScript_1A0166
+	goto_if_eq RustboroCity_EventScript_1A0166
 	compare RESULT, 1
-	jumpeq RustboroCity_EventScript_1A016C
+	goto_if_eq RustboroCity_EventScript_1A016C
 	end
 
 RustboroCity_EventScript_1A0166:: @ 81A0166
-	setvar 0x4010, 105
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 RustboroCity_EventScript_1A016C:: @ 81A016C
-	setvar 0x4010, 100
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 LavaridgeTown_EventScript_1A0172:: @ 81A0172
 Route110_EventScript_1A0172:: @ 81A0172
 Route119_EventScript_1A0172:: @ 81A0172
-	checkgender
+	checkplayergender
 	compare RESULT, 0
-	jumpeq LavaridgeTown_EventScript_1A018A
+	goto_if_eq LavaridgeTown_EventScript_1A018A
 	compare RESULT, 1
-	jumpeq LavaridgeTown_EventScript_1A0190
+	goto_if_eq LavaridgeTown_EventScript_1A0190
 	end
 
 LavaridgeTown_EventScript_1A018A:: @ 81A018A
-	setvar 0x4013, 106
+	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
 	return
 
 LavaridgeTown_EventScript_1A0190:: @ 81A0190
-	setvar 0x4013, 101
+	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
 	return
 
 AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1897,30 +1887,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
 	.ifdef SAPPHIRE
-	setvar 0x4011, 117
-	setvar 0x4012, 118
-	setvar 0x4014, 119
-	setvar 0x4015, 120
-	setvar 0x4016, 195
-	setvar 0x4017, 196
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
 	.else
-	setvar 0x4011, 119
-	setvar 0x4012, 120
-	setvar 0x4014, 117
-	setvar 0x4015, 118
-	setvar 0x4016, 196
-	setvar 0x4017, 195
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
 	.endif
 	return
 
 CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
 	.ifdef SAPPHIRE
-	setvar 0x4018, 197
-	setvar 0x4019, 205
+	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
+	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
 	.else
-	setvar 0x4018, 198
-	setvar 0x4019, 206
+	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
+	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
 	.endif
 	return
 
@@ -1932,7 +1922,7 @@ MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0
 PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0
 RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0
 SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-	switch 0x8008
+	switch VAR_SPECIAL_8
 	case 1, DewfordTown_Gym_EventScript_1A021E
 	case 2, DewfordTown_Gym_EventScript_1A0225
 	case 3, DewfordTown_Gym_EventScript_1A022F
@@ -1944,66 +1934,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
 	end
 
 DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
-	cleartrainerflag OPPONENT_JOSH
-	cleartrainerflag OPPONENT_TOMMY
+	settrainerflag OPPONENT_JOSH
+	settrainerflag OPPONENT_TOMMY
 	return
 
 DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
-	cleartrainerflag OPPONENT_HIDEKI
-	cleartrainerflag OPPONENT_TESSA
-	cleartrainerflag OPPONENT_LAURA
+	settrainerflag OPPONENT_HIDEKI
+	settrainerflag OPPONENT_TESSA
+	settrainerflag OPPONENT_LAURA
 	return
 
 DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
-	cleartrainerflag OPPONENT_KIRK
-	cleartrainerflag OPPONENT_SHAWN
-	cleartrainerflag OPPONENT_BEN
-	cleartrainerflag OPPONENT_VIVIAN
+	settrainerflag OPPONENT_KIRK
+	settrainerflag OPPONENT_SHAWN
+	settrainerflag OPPONENT_BEN
+	settrainerflag OPPONENT_VIVIAN
 	return
 
 DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
-	cleartrainerflag OPPONENT_COLE
-	cleartrainerflag OPPONENT_AXLE
-	cleartrainerflag OPPONENT_ANDY
-	cleartrainerflag OPPONENT_ZANE
-	cleartrainerflag OPPONENT_SADIE
+	settrainerflag OPPONENT_COLE
+	settrainerflag OPPONENT_AXLE
+	settrainerflag OPPONENT_ANDY
+	settrainerflag OPPONENT_ZANE
+	settrainerflag OPPONENT_SADIE
 	return
 
 DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
-	cleartrainerflag OPPONENT_RANDALL
-	cleartrainerflag OPPONENT_PARKER
-	cleartrainerflag OPPONENT_GEORGE
-	cleartrainerflag OPPONENT_BERKE
-	cleartrainerflag OPPONENT_MARY
-	cleartrainerflag OPPONENT_LORI
-	cleartrainerflag OPPONENT_JODY
+	settrainerflag OPPONENT_RANDALL
+	settrainerflag OPPONENT_PARKER
+	settrainerflag OPPONENT_GEORGE
+	settrainerflag OPPONENT_BERKE
+	settrainerflag OPPONENT_MARY
+	settrainerflag OPPONENT_LORI
+	settrainerflag OPPONENT_JODY
 	return
 
 DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
-	cleartrainerflag OPPONENT_JARED
-	cleartrainerflag OPPONENT_TERRELL
-	cleartrainerflag OPPONENT_KYLEE
-	cleartrainerflag OPPONENT_WILL
+	settrainerflag OPPONENT_JARED
+	settrainerflag OPPONENT_TERRELL
+	settrainerflag OPPONENT_KYLEE
+	settrainerflag OPPONENT_WILL
 	return
 
 DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
-	cleartrainerflag OPPONENT_PRESTON
-	cleartrainerflag OPPONENT_VIRGIL
-	cleartrainerflag OPPONENT_FRITZ
-	cleartrainerflag OPPONENT_HANNAH
-	cleartrainerflag OPPONENT_SAMANTHA
-	cleartrainerflag OPPONENT_MAURA
+	settrainerflag OPPONENT_PRESTON
+	settrainerflag OPPONENT_VIRGIL
+	settrainerflag OPPONENT_FRITZ
+	settrainerflag OPPONENT_HANNAH
+	settrainerflag OPPONENT_SAMANTHA
+	settrainerflag OPPONENT_MAURA
 	return
 
 DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
-	cleartrainerflag OPPONENT_ANDREA
-	cleartrainerflag OPPONENT_CRISSY
-	cleartrainerflag OPPONENT_BRIANNA_2
-	cleartrainerflag OPPONENT_CONNIE
-	cleartrainerflag OPPONENT_BRIDGET
-	cleartrainerflag OPPONENT_OLIVIA
-	cleartrainerflag OPPONENT_TIFFANY
-	cleartrainerflag OPPONENT_MARISSA
+	settrainerflag OPPONENT_ANDREA
+	settrainerflag OPPONENT_CRISSY
+	settrainerflag OPPONENT_BRIANNA_2
+	settrainerflag OPPONENT_CONNIE
+	settrainerflag OPPONENT_BRIDGET
+	settrainerflag OPPONENT_OLIVIA
+	settrainerflag OPPONENT_TIFFANY
+	settrainerflag OPPONENT_MARISSA
 	return
 
 DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
@@ -2085,9 +2075,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1
 Route128_EventScript_1A02C1:: @ 81A02C1
 SootopolisCity_EventScript_1A02C1:: @ 81A02C1
 	.ifdef SAPPHIRE
-	setweather 13
+	setweather WEATHER_RAIN_HEAVY
 	.else
-	setweather 12
+	setweather WEATHER_DROUGHT
 	.endif
 	return
 
@@ -2100,7 +2090,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-	fanfare 369
+	playfanfare BGM_ME_BACHI
 	waitfanfare
 	return
 
@@ -2109,9 +2099,9 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
 Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
 SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
-	fanfare 368
+	playfanfare BGM_ME_ASA
 	waitfanfare
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	fadescreen 0
 	return
 
@@ -2127,59 +2117,59 @@ Event_WorldMap:: @ 81A02D6
 DewfordTown_EventScript_1A02E7:: @ 81A02E7
 Route104_EventScript_1A02E7:: @ 81A02E7
 Route109_EventScript_1A02E7:: @ 81A02E7
-	setflag 0x4001
-	playmusic 431, 0
+	setflag FLAG_SPECIAL_FLAG_1
+	playbgm BGM_M_BOAT, FALSE
 	return
 
 DewfordTown_EventScript_1A02EF:: @ 81A02EF
 Route104_EventScript_1A02EF:: @ 81A02EF
 Route109_EventScript_1A02EF:: @ 81A02EF
-	clearflag 0x4001
-	fadedefault
+	clearflag FLAG_SPECIAL_FLAG_1
+	fadedefaultbgm
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4
 Route101_EventScript_1A02F4:: @ 81A02F4
 Route103_EventScript_1A02F4:: @ 81A02F4
-	compare 0x4085, 0
-	jumpeq Route101_EventScript_1A14DC
-	compare 0x4049, 0
-	callif 1, Route101_EventScript_1A0358
-	compare 0x4049, 1
-	callif 1, Route101_EventScript_1A0358
-	compare 0x4049, 2
-	callif 1, Route101_EventScript_1A0365
-	compare 0x4049, 3
-	callif 1, Route101_EventScript_1A0365
-	compare 0x4049, 4
-	callif 1, Route101_EventScript_1A0372
-	compare 0x4049, 5
-	callif 1, Route101_EventScript_1A0372
-	compare 0x4049, 6
-	callif 1, Route101_EventScript_1A0358
-	compare 0x4049, 7
-	callif 1, Route101_EventScript_1A0358
+	compare VAR_PETALBURG_GYM_STATE, 0
+	goto_if_eq Route101_EventScript_1A14DC
+	compare VAR_BIRCH_STATE, 0
+	call_if_eq Route101_EventScript_1A0358
+	compare VAR_BIRCH_STATE, 1
+	call_if_eq Route101_EventScript_1A0358
+	compare VAR_BIRCH_STATE, 2
+	call_if_eq Route101_EventScript_1A0365
+	compare VAR_BIRCH_STATE, 3
+	call_if_eq Route101_EventScript_1A0365
+	compare VAR_BIRCH_STATE, 4
+	call_if_eq Route101_EventScript_1A0372
+	compare VAR_BIRCH_STATE, 5
+	call_if_eq Route101_EventScript_1A0372
+	compare VAR_BIRCH_STATE, 6
+	call_if_eq Route101_EventScript_1A0358
+	compare VAR_BIRCH_STATE, 7
+	call_if_eq Route101_EventScript_1A0358
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
-	clearflag 721
-	clearflag 896
-	setflag 897
-	setflag 898
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	clearflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
 	return
 
 Route101_EventScript_1A0365:: @ 81A0365
-	clearflag 897
-	setflag 721
-	setflag 896
-	setflag 898
+	clearflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE103
 	return
 
 Route101_EventScript_1A0372:: @ 81A0372
-	clearflag 898
-	setflag 897
-	setflag 721
-	setflag 896
+	clearflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F
@@ -2187,9 +2177,9 @@ Route101_EventScript_1A037F:: @ 81A037F
 Route103_EventScript_1A037F:: @ 81A037F
 	lock
 	faceplayer
-	msgbox Route101_Text_1C4449, 5
-	compare RESULT, 0
-	jumpeq Route101_EventScript_1A039B
+	msgbox Route101_Text_1C4449, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route101_EventScript_1A039B
 	call Route101_EventScript_1A03B0
 	release
 	end
@@ -2200,40 +2190,40 @@ Route101_EventScript_1A039B:: @ 81A039B
 	end
 
 Route101_EventScript_1A03A5:: @ 81A03A5
-	copyvar 0x8004, 0x8009
+	copyvar VAR_SPECIAL_4, VAR_SPECIAL_9
 	special ShowPokedexRatingMessage
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0
 Route101_EventScript_1A03B0:: @ 81A03B0
-	setvar 0x8004, 0
-	specialval RESULT, ScriptGetPokedexInfo
-	copyvar 0x8008, 0x8005
-	copyvar 0x8009, 0x8006
-	copyvar 0x800a, RESULT
-	buffernum 0, 0x8008
-	buffernum 1, 0x8009
+	setvar VAR_SPECIAL_4, 0
+	specialvar RESULT, ScriptGetPokedexInfo
+	copyvar VAR_SPECIAL_8, VAR_SPECIAL_5
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	copyvar VAR_SPECIAL_A, RESULT
+	buffernumberstring 0, VAR_SPECIAL_8
+	buffernumberstring 1, VAR_SPECIAL_9
 	msgbox Route101_Text_1C44DC, 4
 	call Route101_EventScript_1A03A5
-	compare 0x800a, 0
-	jumpeq Route101_EventScript_1A14DC
-	setvar 0x8004, 1
-	specialval RESULT, ScriptGetPokedexInfo
-	copyvar 0x8008, 0x8005
-	copyvar 0x8009, 0x8006
-	buffernum 0, 0x8008
-	buffernum 1, 0x8009
+	compare VAR_SPECIAL_A, 0
+	goto_if_eq Route101_EventScript_1A14DC
+	setvar VAR_SPECIAL_4, 1
+	specialvar RESULT, ScriptGetPokedexInfo
+	copyvar VAR_SPECIAL_8, VAR_SPECIAL_5
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	buffernumberstring 0, VAR_SPECIAL_8
+	buffernumberstring 1, VAR_SPECIAL_9
 	msgbox Route101_Text_1C4B05, 4
 	return
 
 BattleTower_Outside_EventScript_1A040E:: @ 81A040E
 LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E
 SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E
-	pause 60
-	move 0x8004, SlateportCity_Harbor_Movement_1A041C
-	waitmove 0
+	delay 60
+	applymovement VAR_SPECIAL_4, SlateportCity_Harbor_Movement_1A041C
+	waitmovement 0
 	return
 
 SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
@@ -2247,35 +2237,35 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
 	step_end
 
 PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
-	setflag 740
-	setflag 743
-	setflag 741
-	setflag 744
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	setvar 0x4096, 0
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setvar VAR_BRINEY_LOCATION, 0
 	return
 
 RusturfTunnel_EventScript_1A0442:: @ 81A0442
-	disappear 1
-	disappear 10
-	clearflag 808
-	clearflag 984
-	setvar 0x409a, 6
-	setflag 199
+	removeobject 1
+	removeobject 10
+	clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+	setvar VAR_RUSTURF_TUNNEL_STATE, 6
+	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
 EventScript_1A0457: @ unreferenced?
-	pause 30
-	move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
-	waitmove 0
-	spritevisible 255, 0, 0
-	pause 30
-	move 255, Movement_1A047A
-	waitmove 0
-	pause 30
+	delay 30
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+	waitmovement 0
+	showobjectat 255, MAP_PETALBURG_CITY
+	delay 30
+	applymovement 255, Movement_1A047A
+	waitmovement 0
+	delay 30
 	return
 
 Movement_1A047A:
@@ -2285,20 +2275,20 @@ Movement_1A047A:
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
 	compare FACING, 1
-	callif 1, BattleTower_Outside_EventScript_160B2F
+	call_if_eq BattleTower_Outside_EventScript_160B2F
 	compare FACING, 3
-	callif 1, BattleTower_Outside_EventScript_160B3A
-	pause 30
-	spriteinvisible 255, 0, 0
+	call_if_eq BattleTower_Outside_EventScript_160B3A
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
 	call BattleTower_Outside_EventScript_1A040E
 	return
 
 CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
 	lockall
-	checksound
-	pokecry SPECIES_GROUDON_OR_KYOGRE, 2
-	waitpokecry
-	setvar 0x4005, 1
+	waitse
+	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
+	waitmoncry
+	setvar VAR_TEMP_5, 1
 	releaseall
 	end
 
@@ -2307,27 +2297,27 @@ CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF
 CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF
 CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF
 	lockall
-	setvar 0x4001, 1
-	jump CaveOfOrigin_1F_EventScript_1A04D3
+	setvar VAR_TEMP_1, 1
+	goto CaveOfOrigin_1F_EventScript_1A04D3
 	end
 
 CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB
 CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB
 	lockall
-	setvar 0x4002, 1
-	jump CaveOfOrigin_B2F_EventScript_1A04D3
+	setvar VAR_TEMP_2, 1
+	goto CaveOfOrigin_B2F_EventScript_1A04D3
 	end
 
 @ 81A04C7
 	lockall
-	setvar 0x4003, 1
-	jump CaveOfOrigin_B2F_EventScript_1A04D3
+	setvar VAR_TEMP_3, 1
+	goto CaveOfOrigin_B2F_EventScript_1A04D3
 	end
 
 CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3
-	setvar 0x8004, 1
-	setvar 0x8005, 1
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 1
 	special sub_810F758
 	waitstate
 	releaseall
@@ -2338,11 +2328,11 @@ CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3
 CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3
 CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3
 CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3
-	setvar 0x4001, 1
-	setvar 0x4002, 1
-	setvar 0x4003, 1
-	setvar 0x4004, 1
-	setvar 0x4005, 1
+	setvar VAR_TEMP_1, 1
+	setvar VAR_TEMP_2, 1
+	setvar VAR_TEMP_3, 1
+	setvar VAR_TEMP_4, 1
+	setvar VAR_TEMP_5, 1
 	return
 
 AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
@@ -2350,14 +2340,14 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
-	checksound
-	pokecry SPECIES_ELECTRODE, 2
-	pause 40
-	waitpokecry
-	setflag 977
-	setflag 2145
+	waitse
+	playmoncry SPECIES_ELECTRODE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2366,140 +2356,140 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
-	checksound
-	pokecry SPECIES_ELECTRODE, 2
-	pause 40
-	waitpokecry
-	setflag 978
-	setflag 2145
+	waitse
+	playmoncry SPECIES_ELECTRODE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
 Route120_EventScript_1A0539:: @ 81A0539
 	lock
 	faceplayer
-	setvar 0x8004, 1
-	jump Route120_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 1
+	goto Route120_EventScript_1A0594
 	end
 
 Route120_EventScript_1A0546:: @ 81A0546
 	lock
 	faceplayer
-	setvar 0x8004, 2
-	jump Route120_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 2
+	goto Route120_EventScript_1A0594
 	end
 
 Route120_EventScript_1A0553:: @ 81A0553
 	lock
 	faceplayer
-	setvar 0x8004, 3
-	jump Route120_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 3
+	goto Route120_EventScript_1A0594
 	end
 
 Route120_EventScript_1A0560:: @ 81A0560
 	lock
 	faceplayer
-	setvar 0x8004, 4
-	jump Route120_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 4
+	goto Route120_EventScript_1A0594
 	end
 
 Route120_EventScript_1A056D:: @ 81A056D
 	lock
 	faceplayer
-	setvar 0x8004, 5
-	jump Route120_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 5
+	goto Route120_EventScript_1A0594
 	end
 
 Route119_EventScript_1A057A:: @ 81A057A
 	lock
 	faceplayer
-	setvar 0x8004, 6
-	jump Route119_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 6
+	goto Route119_EventScript_1A0594
 	end
 
 Route119_EventScript_1A0587:: @ 81A0587
 	lock
 	faceplayer
-	setvar 0x8004, 7
-	jump Route119_EventScript_1A0594
+	setvar VAR_SPECIAL_4, 7
+	goto Route119_EventScript_1A0594
 	end
 
 Route119_EventScript_1A0594:: @ 81A0594
 Route120_EventScript_1A0594:: @ 81A0594
 	checkitem ITEM_DEVON_SCOPE, 1
 	compare RESULT, 1
-	jumpeq Route119_EventScript_1A05AE
+	goto_if_eq Route119_EventScript_1A05AE
 	msgbox Route119_Text_171B93, 4
 	release
 	end
 
 Route119_EventScript_1A05AE:: @ 81A05AE
-	msgbox Route119_Text_171BB6, 5
-	compare RESULT, 1
-	jumpeq Route119_EventScript_1A05C3
+	msgbox Route119_Text_171BB6, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route119_EventScript_1A05C3
 	release
 	end
 
 Route119_EventScript_1A05C3:: @ 81A05C3
 	msgbox Route119_Text_171BF6, 4
-	closebutton
-	move LAST_TALKED, Route119_Movement_1A0839
-	waitmove 0
-	move LAST_TALKED, Route119_Movement_1A0662
-	waitmove 0
-	checksound
-	pokecry SPECIES_KECLEON, 2
-	pause 40
-	waitpokecry
+	closemessage
+	applymovement LAST_TALKED, Route119_Movement_1A0839
+	waitmovement 0
+	applymovement LAST_TALKED, Route119_Movement_1A0662
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KECLEON, 2
+	delay 40
+	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
-	compare 0x8004, 1
-	callif 1, Route119_EventScript_1A0646
-	compare 0x8004, 2
-	callif 1, Route119_EventScript_1A064A
-	compare 0x8004, 3
-	callif 1, Route119_EventScript_1A064E
-	compare 0x8004, 4
-	callif 1, Route119_EventScript_1A0652
-	compare 0x8004, 5
-	callif 1, Route119_EventScript_1A0656
-	compare 0x8004, 6
-	callif 1, Route119_EventScript_1A065A
-	compare 0x8004, 7
-	callif 1, Route119_EventScript_1A065E
-	setflag 2145
+	compare VAR_SPECIAL_4, 1
+	call_if_eq Route119_EventScript_1A0646
+	compare VAR_SPECIAL_4, 2
+	call_if_eq Route119_EventScript_1A064A
+	compare VAR_SPECIAL_4, 3
+	call_if_eq Route119_EventScript_1A064E
+	compare VAR_SPECIAL_4, 4
+	call_if_eq Route119_EventScript_1A0652
+	compare VAR_SPECIAL_4, 5
+	call_if_eq Route119_EventScript_1A0656
+	compare VAR_SPECIAL_4, 6
+	call_if_eq Route119_EventScript_1A065A
+	compare VAR_SPECIAL_4, 7
+	call_if_eq Route119_EventScript_1A065E
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
 Route119_EventScript_1A0646:: @ 81A0646
-	setflag 982
+	setflag FLAG_HIDE_KECLEON_ROUTE120_3
 	return
 
 Route119_EventScript_1A064A:: @ 81A064A
-	setflag 985
+	setflag FLAG_HIDE_KECLEON_ROUTE120_4
 	return
 
 Route119_EventScript_1A064E:: @ 81A064E
-	setflag 986
+	setflag FLAG_HIDE_KECLEON_ROUTE120_5
 	return
 
 Route119_EventScript_1A0652:: @ 81A0652
-	setflag 987
+	setflag FLAG_HIDE_KECLEON_ROUTE120_6
 	return
 
 Route119_EventScript_1A0656:: @ 81A0656
-	setflag 988
+	setflag FLAG_HIDE_KECLEON_ROUTE120_7
 	return
 
 Route119_EventScript_1A065A:: @ 81A065A
-	setflag 989
+	setflag FLAG_HIDE_KECLEON_ROUTE119_1
 	return
 
 Route119_EventScript_1A065E:: @ 81A065E
-	setflag 990
+	setflag FLAG_HIDE_KECLEON_ROUTE119_2
 	return
 
 FortreeCity_Movement_1A0662:: @ 81A0662
@@ -2533,7 +2523,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678
 SlateportCity_House1_EventScript_1A0678:: @ 81A0678
 	fadescreen 1
-	special sub_80BF9F8
+	special ChangePokemonNickname
 	waitstate
 	return
 
@@ -2541,33 +2531,33 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F
 GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
-	bufferitem 0, 0x8004
-	fanfare 372
+	bufferitemname 0, VAR_SPECIAL_4
+	playfanfare BGM_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
-	waittext
+	waitmessage
 	waitfanfare
-	removeitem 0x8004, 1
+	takeitem VAR_SPECIAL_4, 1
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693
 EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693
 EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693
 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
-	move 255, EverGrandeCity_SidneysRoom_Movement_1A0853
-	waitmove 0
-	playsfx 8
-	setmaptile 6, 1, 836, 0
-	setmaptile 6, 2, 837, 0
-	setmaptile 0, 2, 734, 1
-	setmaptile 1, 2, 733, 1
-	setmaptile 2, 2, 734, 1
-	setmaptile 3, 2, 733, 1
-	setmaptile 4, 2, 734, 1
-	setmaptile 8, 2, 733, 1
-	setmaptile 9, 2, 734, 1
-	setmaptile 10, 2, 733, 1
-	setmaptile 11, 2, 734, 1
-	setmaptile 12, 2, 733, 1
+	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853
+	waitmovement 0
+	playse SE_DOOR
+	setmetatile 6, 1, 836, 0
+	setmetatile 6, 2, 837, 0
+	setmetatile 0, 2, 734, 1
+	setmetatile 1, 2, 733, 1
+	setmetatile 2, 2, 734, 1
+	setmetatile 3, 2, 733, 1
+	setmetatile 4, 2, 734, 1
+	setmetatile 8, 2, 733, 1
+	setmetatile 9, 2, 734, 1
+	setmetatile 10, 2, 733, 1
+	setmetatile 11, 2, 734, 1
+	setmetatile 12, 2, 733, 1
 	special DrawWholeMapView
 	return
 
@@ -2575,15 +2565,15 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710
 EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710
 EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710
 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
-	move 255, EverGrandeCity_SidneysRoom_Movement_1A0847
-	waitmove 0
-	playsfx 52
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
+	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847
+	waitmovement 0
+	playse SE_TRACK_DOOR
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
 	special DrawWholeMapView
 	return
 
@@ -2591,36 +2581,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757
-	setmaptile 6, 1, 836, 0
-	setmaptile 6, 2, 837, 0
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
-	setmaptile 0, 2, 734, 1
-	setmaptile 1, 2, 733, 1
-	setmaptile 2, 2, 734, 1
-	setmaptile 3, 2, 733, 1
-	setmaptile 4, 2, 734, 1
-	setmaptile 8, 2, 733, 1
-	setmaptile 9, 2, 734, 1
-	setmaptile 10, 2, 733, 1
-	setmaptile 11, 2, 734, 1
-	setmaptile 12, 2, 733, 1
+	setmetatile 6, 1, 836, 0
+	setmetatile 6, 2, 837, 0
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
+	setmetatile 0, 2, 734, 1
+	setmetatile 1, 2, 733, 1
+	setmetatile 2, 2, 734, 1
+	setmetatile 3, 2, 733, 1
+	setmetatile 4, 2, 734, 1
+	setmetatile 8, 2, 733, 1
+	setmetatile 9, 2, 734, 1
+	setmetatile 10, 2, 733, 1
+	setmetatile 11, 2, 734, 1
+	setmetatile 12, 2, 733, 1
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
 	return
 
 SlateportCity_Movement_1A0831:: @ 81A0831
@@ -2985,17 +2975,17 @@ UnknownString_81A0A54: @ 81A0A54
 UnknownString_81A0A66: @ 81A0A66
 	.string "Accessed LANETTE’s PC.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
+gText_NurseJoy_Welcome:: @ 81A0A7D
 	.string "Hello, and welcome to the POKéMON\n"
 	.string "CENTER.\p"
 	.string "We restore your tired POKéMON to\n"
 	.string "full health.\p"
 	.string "Would you like to rest your POKéMON?$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
 	.string "We hope to see you again!$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
 	.string "Thank you for waiting.\p"
 	.string "We’ve restored your POKéMON to\n"
 	.string "full health.$"
@@ -3209,11 +3199,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
 	.string "We’ll accept you as a member and sell\n"
 	.string "you good stuff in secrecy.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
+gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
 	.string "Okay, I’ll take your POKéMON for a\n"
 	.string "few seconds.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
+gText_NurseJoy_Pokerus:: @ 81A1275
 	.string "Your POKéMON may be infected with\n"
 	.string "POKéRUS.\p"
 	.string "Little is known about the POKéRUS\n"
@@ -3259,14 +3249,14 @@ gUnknown_081A14B8:: @ 81A14B8
 	special ExecuteWhiteOut
 	waitstate
 	compare RESULT, 1
-	jumpeq EventScript_1A14CA
+	goto_if_eq EventScript_1A14CA
 	releaseall
 	end
 
 EventScript_1A14CA::
 	message UnknownString_81A1141
-	waittext
-	waitbutton
+	waitmessage
+	waitbuttonpress
 	special sub_8081924
 	waitstate
 	fadescreen 1
@@ -3603,44 +3593,44 @@ gUnknown_081A2C51:: @ 81A2C51
 	special sub_80BB70C
 	special sub_80BB63C
 	compare RESULT, 1
-	jumpeq EventScript_1A2E45
-	checkattack MOVE_SECRET_POWER
-	setanimation 0, RESULT
-	bufferattack 1, MOVE_SECRET_POWER
-	compare 0x8007, 1
-	jumpeq EventScript_1A2CB0
-	compare 0x8007, 2
-	jumpeq EventScript_1A2CB0
-	compare 0x8007, 3
-	jumpeq EventScript_1A2CB0
-	compare 0x8007, 4
-	jumpeq EventScript_1A2CB0
-	compare 0x8007, 5
-	jumpeq EventScript_1A2D08
-	compare 0x8007, 6
-	jumpeq EventScript_1A2D60
+	goto_if_eq EventScript_1A2E45
+	checkpartymove MOVE_SECRET_POWER
+	setfieldeffectargument 0, RESULT
+	buffermovename 1, MOVE_SECRET_POWER
+	compare VAR_SPECIAL_7, 1
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_SPECIAL_7, 2
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_SPECIAL_7, 3
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_SPECIAL_7, 4
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_SPECIAL_7, 5
+	goto_if_eq EventScript_1A2D08
+	compare VAR_SPECIAL_7, 6
+	goto_if_eq EventScript_1A2D60
 	end
 
 EventScript_1A2CB0:
 	lockall
 	compare RESULT, 6
-	jumpeq EventScript_1A2CF1
-	bufferpartypoke 0, RESULT
-	msgbox UnknownString_8198F34, 5
-	compare RESULT, 0
-	jumpeq EventScript_1A2F3A
+	goto_if_eq EventScript_1A2CF1
+	bufferpartymonnick 0, RESULT
+	msgbox UnknownString_8198F34, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
-	doanimation 11
+	closemessage
+	dofieldeffect 11
 	waitstate
-	jump EventScript_1A2CFA
+	goto EventScript_1A2CFA
 	end
 
 gUnknown_081A2CE6:: @ 81A2CE6
 	lockall
-	doanimation 11
+	dofieldeffect 11
 	waitstate
-	jump EventScript_1A2CFA
+	goto EventScript_1A2CFA
 	end
 
 EventScript_1A2CF1:
@@ -3649,29 +3639,29 @@ EventScript_1A2CF1:
 
 EventScript_1A2CFA:
 	msgbox UnknownString_8198F6E, 4
-	jump EventScript_1A2DB8
+	goto EventScript_1A2DB8
 	end
 
 EventScript_1A2D08:
 	lockall
 	compare RESULT, 6
-	jumpeq EventScript_1A2D49
-	bufferpartypoke 0, RESULT
-	msgbox UnknownString_81A197B, 5
-	compare RESULT, 0
-	jumpeq EventScript_1A2F3A
+	goto_if_eq EventScript_1A2D49
+	bufferpartymonnick 0, RESULT
+	msgbox UnknownString_81A197B, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
-	doanimation 26
+	closemessage
+	dofieldeffect 26
 	waitstate
-	jump EventScript_1A2D52
+	goto EventScript_1A2D52
 	end
 
 gUnknown_081A2D3E:: @ 81A2D3E
 	lockall
-	doanimation 26
+	dofieldeffect 26
 	waitstate
-	jump EventScript_1A2D52
+	goto EventScript_1A2D52
 	end
 
 EventScript_1A2D49:
@@ -3680,29 +3670,29 @@ EventScript_1A2D49:
 
 EventScript_1A2D52:
 	msgbox UnknownString_81A19C4, 4
-	jump EventScript_1A2DB8
+	goto EventScript_1A2DB8
 	end
 
 EventScript_1A2D60:
 	lockall
 	compare RESULT, 6
-	jumpeq EventScript_1A2DA1
-	bufferpartypoke 0, RESULT
-	msgbox UnknownString_81A1A4B, 5
-	compare RESULT, 0
-	jumpeq EventScript_1A2F3A
+	goto_if_eq EventScript_1A2DA1
+	bufferpartymonnick 0, RESULT
+	msgbox UnknownString_81A1A4B, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
-	doanimation 27
+	closemessage
+	dofieldeffect 27
 	waitstate
-	jump EventScript_1A2DAA
+	goto EventScript_1A2DAA
 	end
 
 gUnknown_081A2D96:: @ 81A2D96
 	lockall
-	doanimation 27
+	dofieldeffect 27
 	waitstate
-	jump EventScript_1A2DAA
+	goto EventScript_1A2DAA
 	end
 
 EventScript_1A2DA1:
@@ -3711,38 +3701,38 @@ EventScript_1A2DA1:
 
 EventScript_1A2DAA:
 	msgbox UnknownString_81A1AA9, 4
-	jump EventScript_1A2DB8
+	goto EventScript_1A2DB8
 	end
 
 EventScript_1A2DB8:
-	closebutton
-	playsfx 9
-	setvar 0x4097, 0
-	setflag 173
+	closemessage
+	playse SE_KAIDAN
+	setvar VAR_0x4097, 0
+	setflag FLAG_DECORATION_1
 	special sub_80BB8CC
 	special sub_80BBAF0
-	setvar 0x8004, 0
-	setvar 0x8005, 0
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 0
 	special sub_80BBDD0
-	setvar 0x4089, 1
+	setvar VAR_0x4089, 1
 	waitstate
 	end
 
 SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
-	move 255, SecretBase_RedCave1_Movement_1A2E11
-	waitmove 0
-	setvar 0x4097, 1
-	msgbox SecretBase_RedCave1_Text_198F89, 5
-	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A2E08
-	closebutton
-	playsfx 9
+	applymovement 255, SecretBase_RedCave1_Movement_1A2E11
+	waitmovement 0
+	setvar VAR_0x4097, 1
+	msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
+	closemessage
+	playse SE_KAIDAN
 	special sub_80BC440
 	end
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
-	closebutton
-	setflag 96
+	closemessage
+	setflag FLAG_RECEIVED_SECRET_POWER
 	special sub_80BBC78
 	waitstate
 	end
@@ -3754,116 +3744,116 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
 
 gUnknown_081A2E14:: @ 81A2E14
 	lockall
-	setvar 0x4097, 1
-	playsfx 9
+	setvar VAR_0x4097, 1
+	playse SE_KAIDAN
 	special sub_80BC114
 	compare RESULT, 0
-	jumpeq EventScript_1A2E38
-	clearflag 173
+	goto_if_eq EventScript_1A2E38
+	clearflag FLAG_DECORATION_1
 	special sub_80BBAF0
-	setvar 0x4089, 0
+	setvar VAR_0x4089, 0
 	waitstate
 	end
 
 EventScript_1A2E38:
-	setflag 173
+	setflag FLAG_DECORATION_1
 	special sub_80BBAF0
-	setvar 0x4089, 0
+	setvar VAR_0x4089, 0
 	waitstate
 	end
 
 EventScript_1A2E45:
-	checkattack MOVE_SECRET_POWER
+	checkpartymove MOVE_SECRET_POWER
 	compare RESULT, 6
-	jumpeq EventScript_1A2EF7
-	setanimation 0, RESULT
-	setorcopyvar 0x8004, RESULT
+	goto_if_eq EventScript_1A2EF7
+	setfieldeffectargument 0, RESULT
+	setorcopyvar VAR_SPECIAL_4, RESULT
 	lockall
 	special GetSecretBaseNearbyMapName
-	msgbox UnknownString_81A3C71, 5
-	compare RESULT, 0
-	jumpeq EventScript_1A2F3A
-	msgbox UnknownString_81A38FB, 5
-	compare RESULT, 0
-	jumpeq EventScript_1A2F3A
+	msgbox UnknownString_81A3C71, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	msgbox UnknownString_81A38FB, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_1A2F3A
 	fadescreen 1
-	special sub_80BC50C
-	closebutton
+	special MoveSecretBase
+	closemessage
 	fadescreen 0
-	msgbox UnknownString_81A3CC9, 5
-	compare RESULT, 0
-	jumpeq EventScript_1A2F3A
-	bufferpartypoke 0, 0x8004
-	bufferattack 1, MOVE_SECRET_POWER
+	msgbox UnknownString_81A3CC9, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	bufferpartymonnick 0, VAR_SPECIAL_4
+	buffermovename 1, MOVE_SECRET_POWER
 	msgbox UsedCutRockSmashText, 4
-	closebutton
-	closebutton
-	compare 0x8007, 1
-	jumpeq gUnknown_081A2CE6
-	compare 0x8007, 2
-	jumpeq gUnknown_081A2CE6
-	compare 0x8007, 3
-	jumpeq gUnknown_081A2CE6
-	compare 0x8007, 4
-	jumpeq gUnknown_081A2CE6
-	compare 0x8007, 5
-	jumpeq gUnknown_081A2D3E
-	compare 0x8007, 6
-	jumpeq gUnknown_081A2D96
+	closemessage
+	closemessage
+	compare VAR_SPECIAL_7, 1
+	goto_if_eq gUnknown_081A2CE6
+	compare VAR_SPECIAL_7, 2
+	goto_if_eq gUnknown_081A2CE6
+	compare VAR_SPECIAL_7, 3
+	goto_if_eq gUnknown_081A2CE6
+	compare VAR_SPECIAL_7, 4
+	goto_if_eq gUnknown_081A2CE6
+	compare VAR_SPECIAL_7, 5
+	goto_if_eq gUnknown_081A2D3E
+	compare VAR_SPECIAL_7, 6
+	goto_if_eq gUnknown_081A2D96
 	releaseall
 	end
 
 EventScript_1A2EF7::
-	compare 0x8007, 1
-	jumpeq EventScript_1A2CF1
-	compare 0x8007, 2
-	jumpeq EventScript_1A2CF1
-	compare 0x8007, 3
-	jumpeq EventScript_1A2CF1
-	compare 0x8007, 4
-	jumpeq EventScript_1A2CF1
-	compare 0x8007, 5
-	jumpeq EventScript_1A2D49
-	compare 0x8007, 6
-	jumpeq EventScript_1A2DA1
+	compare VAR_SPECIAL_7, 1
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_SPECIAL_7, 2
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_SPECIAL_7, 3
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_SPECIAL_7, 4
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_SPECIAL_7, 5
+	goto_if_eq EventScript_1A2D49
+	compare VAR_SPECIAL_7, 6
+	goto_if_eq EventScript_1A2DA1
 	end
 
 EventScript_1A2F3A::
-	closebutton
+	closemessage
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D
-	setflag 174
-	setflag 175
-	setflag 176
-	setflag 177
-	setflag 178
-	setflag 179
-	setflag 180
-	setflag 181
-	setflag 182
-	setflag 183
-	setflag 184
-	setflag 185
-	setflag 186
-	setflag 187
+	setflag FLAG_DECORATION_2
+	setflag FLAG_DECORATION_3
+	setflag FLAG_DECORATION_4
+	setflag FLAG_DECORATION_5
+	setflag FLAG_DECORATION_6
+	setflag FLAG_DECORATION_7
+	setflag FLAG_DECORATION_8
+	setflag FLAG_DECORATION_9
+	setflag FLAG_DECORATION_10
+	setflag FLAG_DECORATION_11
+	setflag FLAG_DECORATION_12
+	setflag FLAG_DECORATION_13
+	setflag FLAG_DECORATION_14
+	setflag FLAG_DECORATION_15
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68
 LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68
 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68
-	setvar 0x8004, 0
-	setvar 0x8005, 0
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 0
 	special sub_80BBDD0
-	setvar 0x4089, 1
+	setvar VAR_0x4089, 1
 	end
 
 gUnknown_081A2F7B:: @ 81A2F7B
-	setvar 0x8005, 0
-	jump EventScript_1A2F86
+	setvar VAR_SPECIAL_5, 0
+	goto EventScript_1A2F86
 	end
 
 EventScript_1A2F86:
@@ -3871,20 +3861,20 @@ EventScript_1A2F86:
 	end
 
 gUnknown_081A2F8A:: @ 81A2F8A
-	setvar 0x8004, 0
-	jump EventScript_1A2F95
+	setvar VAR_SPECIAL_4, 0
+	goto EventScript_1A2F95
 	end
 
 EventScript_1A2F95:
 	special sub_8100A7C
 	compare RESULT, 1
-	jumpeq EventScript_1A2FBF
-	addvar 0x8004, 1
-	compare 0x8005, 0
-	jumpeq EventScript_1A2F95
-	disappear 0x8006
-	setflag 0x8005
-	jump EventScript_1A2F95
+	goto_if_eq EventScript_1A2FBF
+	addvar VAR_SPECIAL_4, 1
+	compare VAR_SPECIAL_5, 0
+	goto_if_eq EventScript_1A2F95
+	removeobject VAR_SPECIAL_6
+	setflag VAR_SPECIAL_5
+	goto EventScript_1A2F95
 	end
 
 EventScript_1A2FBF:
@@ -3915,46 +3905,45 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0
 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0
 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	special sub_80BCE90
-	compare 0x8004, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3032
-	compare 0x8004, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A30AE
-	compare 0x8004, 2
-	jumpeq SecretBase_RedCave1_EventScript_1A312A
-	compare 0x8004, 3
-	jumpeq SecretBase_RedCave1_EventScript_1A31A6
-	compare 0x8004, 4
-	jumpeq SecretBase_RedCave1_EventScript_1A3222
-	compare 0x8004, 5
-	jumpeq SecretBase_RedCave1_EventScript_1A329E
-	compare 0x8004, 6
-	jumpeq SecretBase_RedCave1_EventScript_1A331A
-	compare 0x8004, 7
-	jumpeq SecretBase_RedCave1_EventScript_1A3396
-	compare 0x8004, 8
-	jumpeq SecretBase_RedCave1_EventScript_1A3412
-	compare 0x8004, 9
-	jumpeq SecretBase_RedCave1_EventScript_1A348E
+	compare VAR_SPECIAL_4, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3032
+	compare VAR_SPECIAL_4, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A30AE
+	compare VAR_SPECIAL_4, 2
+	goto_if_eq SecretBase_RedCave1_EventScript_1A312A
+	compare VAR_SPECIAL_4, 3
+	goto_if_eq SecretBase_RedCave1_EventScript_1A31A6
+	compare VAR_SPECIAL_4, 4
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3222
+	compare VAR_SPECIAL_4, 5
+	goto_if_eq SecretBase_RedCave1_EventScript_1A329E
+	compare VAR_SPECIAL_4, 6
+	goto_if_eq SecretBase_RedCave1_EventScript_1A331A
+	compare VAR_SPECIAL_4, 7
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3396
+	compare VAR_SPECIAL_4, 8
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3412
+	compare VAR_SPECIAL_4, 9
+	goto_if_eq SecretBase_RedCave1_EventScript_1A348E
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A3086
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A30A5
+	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A1AEA, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A308F
+	msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A308F
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1B83, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
@@ -3964,7 +3953,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
 SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1B97, 2
 	end
 
@@ -3973,23 +3962,22 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A3102
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3121
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A1E67, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A310B
+	msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A310B
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1F04, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
@@ -3999,7 +3987,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
 SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1F2E, 2
 	end
 
@@ -4008,23 +3996,22 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A317E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A319D
+	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A218F, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3187
+	msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3187
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2220, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
@@ -4034,7 +4021,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
 SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2230, 2
 	end
 
@@ -4043,23 +4030,22 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A31FA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3219
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A24E1, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3203
+	msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3203
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A256F, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
@@ -4069,7 +4055,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
 SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A258A, 2
 	end
 
@@ -4078,23 +4064,22 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A3276
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3295
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2830, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A327F
+	msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A327F
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A28D7, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
@@ -4104,7 +4089,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
 SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A28F4, 2
 	end
 
@@ -4113,23 +4098,22 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A32F2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3311
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A1CB2, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A32FB
+	msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A32FB
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1D48, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
@@ -4139,7 +4123,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
 SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1D59, 2
 	end
 
@@ -4148,23 +4132,22 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A336E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A338D
+	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2026, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3377
+	msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A3377
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2095, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
@@ -4174,7 +4157,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
 SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A20AE, 2
 	end
 
@@ -4183,23 +4166,22 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A33EA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3409
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A236A, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A33F3
+	msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A33F3
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2405, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
@@ -4209,7 +4191,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
 SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2420, 2
 	end
 
@@ -4218,23 +4200,22 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A3466
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3485
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2663, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A346F
+	msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A346F
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2710, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
@@ -4244,7 +4225,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
 SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2736, 2
 	end
 
@@ -4253,23 +4234,22 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag 2052
-	jumpif 0, SecretBase_RedCave1_EventScript_1A34E2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
-	jumpeq SecretBase_RedCave1_EventScript_1A3501
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
 	lock
 	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2A13, 5
-	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A34EB
+	msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
-	jumpeq SecretBase_RedCave1_EventScript_1A34EB
-	hidebox 0, 0, 15, 10
+	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2AE2, 4
-	jump SecretBase_RedCave1_EventScript_1A350A
+	goto SecretBase_RedCave1_EventScript_1A350A
 	end
 
 SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
@@ -4279,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
 SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2AFB, 2
 	end
 
@@ -4289,11 +4269,11 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501
 
 SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
 	special sub_80BCE1C
-	setvar 0x8004, 1
-	setvar 0x8005, 0
-	special sub_813556C
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 0
+	special StartSpecialBattle
 	waitstate
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	release
 	end
 
@@ -4378,36 +4358,36 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46
 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46
 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46
 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46
-	special sub_80BDE48
-	inccounter GAME_STAT_GOT_INTERVIEWED
+	special InterviewAfter
+	incrementgamestat GAME_STAT_GOT_INTERVIEWED
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D
-	setvar 0x8005, 1
-	special sub_80BF2C4
+	setvar VAR_SPECIAL_5, 1
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADED6
-	copyvar 0x8009, 0x8006
-	msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5
-	compare RESULT, 1
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE84
-	compare RESULT, 0
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEB9
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	msgbox SlateportCity_PokemonFanClub_Text_1A8704, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84
+	compare RESULT, NO
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84
 	msgbox SlateportCity_PokemonFanClub_Text_1A87CA, 4
-	setvar 0x8004, 5
-	copyvar 0x8005, 0x8009
-	setvar 0x8006, 1
+	setvar VAR_SPECIAL_4, 5
+	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
+	setvar VAR_SPECIAL_6, 1
 	call SlateportCity_PokemonFanClub_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 1
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEC3
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3
 	compare RESULT, 0
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEB9
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9
@@ -4417,8 +4397,8 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9
 
 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3
 	msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4
-	setvar 0x8005, 1
-	jump SlateportCity_PokemonFanClub_EventScript_1ADE46
+	setvar VAR_SPECIAL_5, 1
+	goto SlateportCity_PokemonFanClub_EventScript_1ADE46
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6
@@ -4429,41 +4409,40 @@ SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6
 SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
 	lock
 	faceplayer
-	setvar 0x8005, 2
-	special sub_80BF2C4
+	setvar VAR_SPECIAL_5, 2
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
-	copyvar 0x8009, 0x8006
-	checkflag 105
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
-	setflag 105
-	msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5
-	compare RESULT, 1
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
-	compare RESULT, 0
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
+	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
+	msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
+	compare RESULT, NO
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25
-	msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5
-	compare RESULT, 1
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
-	compare RESULT, 0
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
+	msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
+	compare RESULT, NO
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44
 	msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, 4
-	setvar 0x8004, 5
-	copyvar 0x8005, 0x8009
-	setvar 0x8006, 0
+	setvar VAR_SPECIAL_4, 5
+	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
+	setvar VAR_SPECIAL_6, 0
 	call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 1
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83
 	compare RESULT, 0
-	jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79
@@ -4473,8 +4452,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83
 	msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4
-	setvar 0x8005, 2
-	jump SlateportCity_OceanicMuseum_1F_EventScript_1ADE46
+	setvar VAR_SPECIAL_5, 2
+	goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96
@@ -4485,25 +4464,25 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96
 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0
 	lock
 	faceplayer
-	specialval RESULT, sub_80BF544
+	specialvar RESULT, LeadMonNicknamed
 	compare RESULT, 0
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE4D
-	setvar 0x8005, 3
-	special sub_80BF2C4
-	compare RESULT, 1
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0AC
-	copyvar 0x8009, 0x8006
-	msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D
+	setvar VAR_SPECIAL_5, 3
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1ADFE9
-	compare RESULT, 0
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	msgbox SlateportCity_PokemonFanClub_Text_1A82F1, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9
+	compare RESULT, NO
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9
 	msgbox SlateportCity_PokemonFanClub_Text_1A83D0, 4
 	random 3
-	copyvar 0x800a, RESULT
+	copyvar VAR_SPECIAL_A, RESULT
 	switch RESULT
 	case 0, SlateportCity_PokemonFanClub_EventScript_1AE020
 	case 1, SlateportCity_PokemonFanClub_EventScript_1AE02E
@@ -4512,39 +4491,39 @@ SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9
 
 SlateportCity_PokemonFanClub_EventScript_1AE020:: @ 81AE020
 	msgbox SlateportCity_PokemonFanClub_Text_1A8414, 4
-	jump SlateportCity_PokemonFanClub_EventScript_1AE04A
+	goto SlateportCity_PokemonFanClub_EventScript_1AE04A
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE02E:: @ 81AE02E
 	msgbox SlateportCity_PokemonFanClub_Text_1A8470, 4
-	jump SlateportCity_PokemonFanClub_EventScript_1AE04A
+	goto SlateportCity_PokemonFanClub_EventScript_1AE04A
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C
 	msgbox SlateportCity_PokemonFanClub_Text_1A84D5, 4
-	jump SlateportCity_PokemonFanClub_EventScript_1AE04A
+	goto SlateportCity_PokemonFanClub_EventScript_1AE04A
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A
-	setvar 0x8004, 7
-	copyvar 0x8005, 0x8009
-	setvar 0x8006, 0
+	setvar VAR_SPECIAL_4, 7
+	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
+	setvar VAR_SPECIAL_6, 0
 	call SlateportCity_PokemonFanClub_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 0
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
 	msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4
-	setvar 0x8006, 1
+	setvar VAR_SPECIAL_6, 1
 	call SlateportCity_PokemonFanClub_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 0
-	jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
 	msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4
-	copyvar 0x8007, 0x800a
-	setvar 0x8005, 3
-	jump SlateportCity_PokemonFanClub_EventScript_1ADE46
+	copyvar VAR_SPECIAL_7, VAR_SPECIAL_A
+	setvar VAR_SPECIAL_5, 3
+	goto SlateportCity_PokemonFanClub_EventScript_1ADE46
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE0A2:: @ 81AE0A2
@@ -4563,32 +4542,31 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 	lock
 	faceplayer
-	checkflag 2
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE17E
-	setvar 0x8005, 6
-	special sub_80BF2C4
-	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE17E
-	copyvar 0x8009, 0x8006
-	msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5
+	goto_if_set FLAG_TEMP_2, FallarborTown_ContestLobby_EventScript_1AE17E
+	setvar VAR_SPECIAL_5, 6
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE0F8
-	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE12D
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	msgbox FallarborTown_ContestLobby_Text_1A6F7C, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8
+	compare RESULT, NO
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8
 	msgbox FallarborTown_ContestLobby_Text_1A704E, 4
-	setvar 0x8004, 11
-	copyvar 0x8005, 0x8009
-	setvar 0x8006, 0
+	setvar VAR_SPECIAL_4, 11
+	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
+	setvar VAR_SPECIAL_6, 0
 	call FallarborTown_ContestLobby_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE137
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE12D
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D
@@ -4597,21 +4575,21 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137
-	setvar 0x8004, 24
+	setvar VAR_SPECIAL_4, 24
 	special SetContestCategoryStringVarForInterview
 	msgbox FallarborTown_ContestLobby_Text_1A70A5, 4
-	setvar 0x8004, 11
-	copyvar 0x8005, 0x8009
-	setvar 0x8006, 1
+	setvar VAR_SPECIAL_4, 11
+	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
+	setvar VAR_SPECIAL_6, 1
 	call FallarborTown_ContestLobby_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 0
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE12D
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
 	msgbox FallarborTown_ContestLobby_Text_1A7153, 4
-	setflag 2
-	setvar 0x8005, 6
-	jump FallarborTown_ContestLobby_EventScript_1ADE46
+	setflag FLAG_TEMP_2
+	setvar VAR_SPECIAL_5, 6
+	goto FallarborTown_ContestLobby_EventScript_1ADE46
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE17E:: @ 81AE17E
@@ -4623,13 +4601,13 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188
 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188
 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188
 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
-	compare 0x4086, 2
-	jumpif 5, FallarborTown_ContestLobby_EventScript_1AE1FE
-	setvar 0x8005, 6
-	special sub_80BF2C4
+	compare VAR_LINK_CONTEST_ROOM_STATE, 2
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1AE1FE
+	setvar VAR_SPECIAL_5, 6
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq FallarborTown_ContestLobby_EventScript_1AE1FE
-	switch 0x4088
+	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE
+	switch VAR_CONTEST_LOCATION
 	case 0, FallarborTown_ContestLobby_EventScript_1AE1FE
 	case 2, FallarborTown_ContestLobby_EventScript_1AE1EE
 	case 1, FallarborTown_ContestLobby_EventScript_1AE1F2
@@ -4639,19 +4617,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE
-	clearflag 800
+	clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2
-	clearflag 801
+	clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6
-	clearflag 803
+	clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA
-	clearflag 802
+	clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
@@ -4660,39 +4638,38 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
 BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 	lock
 	faceplayer
-	checkflag 2
-	jumpeq BattleTower_Lobby_EventScript_1AE2E3
-	setvar 0x8005, 7
-	special sub_80BF2C4
+	goto_if_set FLAG_TEMP_2, BattleTower_Lobby_EventScript_1AE2E3
+	setvar VAR_SPECIAL_5, 7
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq BattleTower_Lobby_EventScript_1AE2E3
-	copyvar 0x8009, 0x8006
-	msgbox BattleTower_Lobby_Text_1A776D, 5
-	compare RESULT, 1
-	jumpeq BattleTower_Lobby_EventScript_1AE241
-	compare RESULT, 0
-	jumpeq BattleTower_Lobby_EventScript_1AE297
+	goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
+	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
+	msgbox BattleTower_Lobby_Text_1A776D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq BattleTower_Lobby_EventScript_1AE241
+	compare RESULT, NO
+	goto_if_eq BattleTower_Lobby_EventScript_1AE297
 	end
 
 BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	message BattleTower_Lobby_Text_1A7823
-	waittext
+	waitmessage
 	multichoice 19, 8, 45, 1
-	copyvar 0x8008, RESULT
+	copyvar VAR_SPECIAL_8, RESULT
 	compare RESULT, 0
-	callif 1, BattleTower_Lobby_EventScript_1AE2A1
+	call_if_eq BattleTower_Lobby_EventScript_1AE2A1
 	compare RESULT, 1
-	callif 1, BattleTower_Lobby_EventScript_1AE2AA
+	call_if_eq BattleTower_Lobby_EventScript_1AE2AA
 	msgbox BattleTower_Lobby_Text_1A79EB, 4
-	setvar 0x8004, 12
-	copyvar 0x8005, 0x8009
+	setvar VAR_SPECIAL_4, 12
+	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
 	call BattleTower_Lobby_EventScript_1A00F3
 	lock
 	faceplayer
 	compare RESULT, 1
-	jumpeq BattleTower_Lobby_EventScript_1AE2B3
+	goto_if_eq BattleTower_Lobby_EventScript_1AE2B3
 	compare RESULT, 0
-	jumpeq BattleTower_Lobby_EventScript_1AE2D9
+	goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
 	end
 
 BattleTower_Lobby_EventScript_1AE297:: @ 81AE297
@@ -4710,12 +4687,12 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA
 
 BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3
 	compare RESULT, 0
-	jumpeq BattleTower_Lobby_EventScript_1AE2D9
+	goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
 	msgbox BattleTower_Lobby_Text_1A7A6E, 4
-	setflag 2
-	copyvar 0x8004, 0x8008
-	setvar 0x8005, 7
-	jump BattleTower_Lobby_EventScript_1ADE46
+	setflag FLAG_TEMP_2
+	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
+	setvar VAR_SPECIAL_5, 7
+	goto BattleTower_Lobby_EventScript_1ADE46
 	end
 
 BattleTower_Lobby_EventScript_1AE2D9:: @ 81AE2D9
@@ -4729,31 +4706,22 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3
 	end
 
 BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED
-	compare 0x40bc, 0
-	jumpeq BattleTower_Lobby_EventScript_1AE30F
-	setvar 0x8005, 7
-	special sub_80BF2C4
+	compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
+	goto_if_eq BattleTower_Lobby_EventScript_1AE30F
+	setvar VAR_SPECIAL_5, 7
+	special InterviewBefore
 	compare RESULT, 1
-	jumpeq BattleTower_Lobby_EventScript_1AE30F
-	clearflag 918
+	goto_if_eq BattleTower_Lobby_EventScript_1AE30F
+	clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	return
 
 BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
-	setflag 918
+	setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	return
 
 	.include "data/scripts/gabby_and_ty.inc"
 
-	.include "data/scripts/bard.inc"
-	.include "data/scripts/hipster.inc"
-	.include "data/text/trader.inc"
-	.include "data/scripts/trader.inc"
-	.include "data/text/storyteller.inc"
-	.include "data/scripts/storyteller.inc"
-	.include "data/text/giddy.inc"
-	.include "data/scripts/giddy.inc"
-	.include "data/text/bard.inc"
-	.include "data/text/hipster.inc"
+	.include "data/scripts/mauville_man.inc"
 
 	.include "data/field_move_scripts.inc"
 	.include "data/item_ball_scripts.inc"
@@ -4777,13 +4745,13 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
 	.include "data/text/magma_summit.inc"
 
 gUnknown_081B694A:: @ 81B694A
-	lighten 1
-	darken 1
+	animateflash 1
+	setflashradius 1
 	end
 
 	.include "data/scripts/players_house.inc"
 
-Event_RunningShoesManual:: @ 81B6E5A
+S_RunningShoesManual:: @ 81B6E5A
 	msgbox UnknownString_81728E3, 3
 	end
 
@@ -4792,7 +4760,7 @@ Event_RunningShoesManual:: @ 81B6E5A
 
 	.include "data/text/trainers.inc"
 
-Event_RepelWoreOff:: @ 81C33E6
+S_RepelWoreOff:: @ 81C33E6
 	msgbox Text_RepelWoreOff, 3
 	end
 
@@ -4805,25 +4773,25 @@ Text_RepelWoreOff: @ 81C33EF
 MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E
 	checkitem ITEM_COIN_CASE, 1
 	compare RESULT, 0
-	jumpeq MauvilleCity_GameCorner_EventScript_1572B5
-	setvar 0x8004, 0
-	event_96 2
+	goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
+	setvar VAR_SPECIAL_4, 0
+	getpricereduction 2
 	compare RESULT, 0
-	jumpeq MauvilleCity_GameCorner_EventScript_1C40DA
-	addvar 0x8004, 128
-	jump MauvilleCity_GameCorner_EventScript_1C40DA
+	goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
+	addvar VAR_SPECIAL_4, 128
+	goto MauvilleCity_GameCorner_EventScript_1C40DA
 	end
 
 MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC
 	checkitem ITEM_COIN_CASE, 1
 	compare RESULT, 0
-	jumpeq MauvilleCity_GameCorner_EventScript_1572B5
-	setvar 0x8004, 1
-	event_96 2
+	goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
+	setvar VAR_SPECIAL_4, 1
+	getpricereduction 2
 	compare RESULT, 0
-	jumpeq MauvilleCity_GameCorner_EventScript_1C40DA
-	addvar 0x8004, 128
-	jump MauvilleCity_GameCorner_EventScript_1C40DA
+	goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
+	addvar VAR_SPECIAL_4, 128
+	goto MauvilleCity_GameCorner_EventScript_1C40DA
 	end
 
 MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
@@ -4872,34 +4840,34 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
-	map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5
+	map_script_2 VAR_ICE_STEP_COUNT, 0, S_FallDownHole
 	.2byte 0
 
 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
 MtPyre_2F_MapScript1_1C6BBF:: @ 81C6BBF
 SkyPillar_2F_MapScript1_1C6BBF:: @ 81C6BBF
 SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
-	copyvar 0x4022, 0x1
+	copyvar VAR_ICE_STEP_COUNT, 0x1
 	end
 
-GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
+S_FallDownHole:: @ 81C6BC5
 	lockall
-	pause 20
-	move 255, GraniteCave_B1F_Movement_1C6BF7
-	waitmove 0
-	playsfx 43
-	pause 60
-	warphole UNDEFINED
+	delay 20
+	applymovement 255, GraniteCave_B1F_Movement_1C6BF7
+	waitmovement 0
+	playse SE_RU_HYUU
+	delay 60
+	warphole MAP_UNDEFINED
 	waitstate
 	end
 
 gUnknown_081C6BDE:: @ 81C6BDE
 	lockall
-	pause 20
-	move 255, GraniteCave_B1F_Movement_1C6BF7
-	waitmove 0
-	playsfx 43
-	pause 60
+	delay 20
+	applymovement 255, GraniteCave_B1F_Movement_1C6BF7
+	waitmovement 0
+	playse SE_RU_HYUU
+	delay 60
 	special sp13F_fall_to_last_warp
 	waitstate
 	end
@@ -4931,9 +4899,9 @@ gUnknown_081C6C02:: @ 81C6C02
 
 @ 81C6C1D
 	lockall
-	braillemsg Underwater_SealedChamber_Braille_1C533D
-	waitbutton
-	hidebox 0, 0, 29, 19
+	braillemessage Underwater_SealedChamber_Braille_1C533D
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
 	releaseall
 	end