Merge branch 'master' into gflib

asm/macros/event.inc

@@ -825,7 +825,7 @@
 	.byte \y
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
 	.macro multichoice x:req, y:req, list:req, b:req
 	.byte 0x6f
 	.byte \x
@@ -834,7 +834,7 @@
 	.byte \b
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
 	.macro multichoicedefault x:req, y:req, list:req, default:req, b:req
 	.byte 0x70
 	.byte \x
@@ -844,7 +844,7 @@
 	.byte \b
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
 	.macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req
 	.byte 0x71
 	.byte \x
@@ -902,15 +902,15 @@
 	.4byte \text
 	.endm
 
-	@ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes.
-	.macro givemon species:req, level:req, item:req, unknown1:req, unknown2:req, unknown3:req
+	@ Gives the player one of the specified (species) Pokemon at level level holding item. The trailing 0s are unused parameters
+	.macro givemon species:req, level:req, item:req
 	.byte 0x79
 	.2byte \species
 	.byte \level
 	.2byte \item
-	.4byte \unknown1
-	.4byte \unknown2
-	.byte \unknown3
+	.4byte 0x0
+	.4byte 0x0
+	.byte 0
 	.endm
 
 	.macro giveegg species:req

charmap.txt

@@ -990,7 +990,16 @@ PH_NURSE_SOLO = 61 02
 
 A_BUTTON = F8 00
 B_BUTTON = F8 01
+L_BUTTON = F8 02
+R_BUTTON = F8 03
+START_BUTTON = F8 04
+SELECT_BUTTON = F8 05
+DPAD_UP = F8 06
+DPAD_DOWN = F8 07
+DPAD_LEFT = F8 08
+DPAD_RIGHT = F8 09
 DPAD_UPDOWN = F8 0A
+DPAD_LEFTRIGHT = F8 0B
 DPAD_NONE = F8 0C
 
 UP_ARROW_2 = F9 00

common_syms/field_specials.txt

@@ -1 +1 @@
-gUnknown_030061D0
+gScrollableMultichoice_ListMenuTemplate

constants/berry_constants.inc

@@ -1,6 +0,0 @@
-	.set BERRY_FIRMNESS_UNKNOWN,    0
-	.set BERRY_FIRMNESS_VERY_SOFT,  1
-	.set BERRY_FIRMNESS_SOFT,       2
-	.set BERRY_FIRMNESS_HARD,       3
-	.set BERRY_FIRMNESS_VERY_HARD,  4
-	.set BERRY_FIRMNESS_SUPER_HARD, 5

constants/constants.inc

@@ -1,6 +1,4 @@
 	.include "constants/gba_constants.inc"
 	.include "constants/global.inc"
 	.include "constants/contest_constants.inc"
-	.include "constants/pokemon_data_constants.inc"
-	.include "constants/berry_constants.inc"
 	.include "constants/contest_move_effects.inc"

constants/pokemon_data_constants.inc

@@ -1,35 +0,0 @@
-	.set GROWTH_MEDIUM_FAST, 0x00
-	.set GROWTH_ERRATIC,     0x01
-	.set GROWTH_FLUCTUATING, 0x02
-	.set GROWTH_MEDIUM_SLOW, 0x03
-	.set GROWTH_FAST,        0x04
-	.set GROWTH_SLOW,        0x05
-
-	.set BODY_COLOR_RED,    0x00
-	.set BODY_COLOR_BLUE,   0x01
-	.set BODY_COLOR_YELLOW, 0x02
-	.set BODY_COLOR_GREEN,  0x03
-	.set BODY_COLOR_BLACK,  0x04
-	.set BODY_COLOR_BROWN,  0x05
-	.set BODY_COLOR_PURPLE, 0x06
-	.set BODY_COLOR_GRAY,   0x07
-	.set BODY_COLOR_WHITE,  0x08
-	.set BODY_COLOR_PINK,   0x09
-
-	.set F_SUMMARY_SCREEN_FLIP_SPRITE, 0x80
-
-	.set EVO_FRIENDSHIP,       0x0001 @ Pokémon levels up with friendship ≥ 220
-	.set EVO_FRIENDSHIP_DAY,   0x0002 @ Pokémon levels up during the day with friendship ≥ 220
-	.set EVO_FRIENDSHIP_NIGHT, 0x0003 @ Pokémon levels up at night with friendship ≥ 220
-	.set EVO_LEVEL,            0x0004 @ Pokémon reaches the specified level
-	.set EVO_TRADE,            0x0005 @ Pokémon is traded
-	.set EVO_TRADE_ITEM,       0x0006 @ Pokémon is traded while it's holding the specified item
-	.set EVO_ITEM,             0x0007 @ specified item is used on Pokémon
-	.set EVO_LEVEL_ATK_GT_DEF, 0x0008 @ Pokémon reaches the specified level with attack > defense
-	.set EVO_LEVEL_ATK_EQ_DEF, 0x0009 @ Pokémon reaches the specified level with attack = defense
-	.set EVO_LEVEL_ATK_LT_DEF, 0x000a @ Pokémon reaches the specified level with attack < defense
-	.set EVO_LEVEL_SILCOON,    0x000b @ Pokémon reaches the specified level with a Silcoon personality value
-	.set EVO_LEVEL_CASCOON,    0x000c @ Pokémon reaches the specified level with a Cascoon personality value
-	.set EVO_LEVEL_NINJASK,    0x000d @ Pokémon reaches the specified level (special value for Ninjask)
-	.set EVO_LEVEL_SHEDINJA,   0x000e @ Pokémon reaches the specified level (special value for Shedinja)
-	.set EVO_BEAUTY,           0x000f @ Pokémon levels up with beauty ≥ specified value

data/event_scripts.s

@@ -1,28 +1,35 @@
 #include "constants/global.h"
+#include "constants/battle.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_setup.h"
+#include "constants/berry.h"
 #include "constants/contest.h"
+#include "constants/daycare.h"
+#include "constants/decorations.h"
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
+#include "constants/field_specials.h"
 #include "constants/flags.h"
-#include "constants/decorations.h"
+#include "constants/game_stat.h"
+#include "constants/item.h"
 #include "constants/items.h"
 #include "constants/heal_locations.h"
 #include "constants/layouts.h"
+#include "constants/lilycove_lady.h"
 #include "constants/map_scripts.h"
 #include "constants/maps.h"
+#include "constants/metatile_labels.h"
 #include "constants/moves.h"
+#include "constants/pokemon.h"
+#include "constants/script_menu.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/trainer_hill.h"
 #include "constants/trainers.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
-#include "constants/trainer_hill.h"
-#include "constants/lilycove_lady.h"
-#include "constants/battle.h"
-#include "constants/metatile_labels.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
@@ -468,22 +475,22 @@ gUnknown_0823B4E8:: @ 823B4E8 ;EventScript_SecretBasePCCancel?
 	end
 
 EventScript_SecretBasePCMainMenuChoice:: @ 823B4EF
-	multichoice 0, 0, 6, 0
+	multichoice 0, 0, MULTI_DECOR_REGISTRY, 0
 	switch VAR_RESULT
 	case 0, EventScript_23B581
 	case 1, EventScript_23B568
 	case 2, EventScript_23B585
 	case 3, EventScript_23B66E
-	case 127, EventScript_23B66E
+	case MULTI_B_PRESSED, EventScript_23B66E
 	end
 
 EventScript_23B531:: @ 823B531
-	multichoice 0, 0, 5, 0
+	multichoice 0, 0, MULTI_DECOR_NOREGISTRY, 0
 	switch VAR_RESULT
 	case 0, EventScript_23B581
 	case 1, EventScript_23B568
 	case 2, EventScript_23B66E
-	case 127, EventScript_23B66E
+	case MULTI_B_PRESSED, EventScript_23B66E
 	end
 
 EventScript_23B568:: @ 823B568
@@ -518,13 +525,13 @@ EventScript_RecordMixingSecretBasePC:: @ 823B589
 EventScript_23B5A1:: @ 823B5A1
 	message Text_SecretBasePCStartMenu
 	waitmessage
-	multichoice 0, 0, 7, 0
+	multichoice 0, 0, MULTI_REGISTER_MENU, 0
 	switch VAR_RESULT
 	case 0, EventScript_23B5F0
 	case 1, EventScript_23B585
 	case 2, EventScript_23B660
 	case 3, EventScript_23B66E
-	case 127, EventScript_23B66E
+	case MULTI_B_PRESSED, EventScript_23B66E
 	end
 
 gUnknown_0823B5E9:: @ 823B5E9
@@ -851,86 +858,86 @@ Std_MsgboxAutoclose:: @ 8271494
 	return
 
 EventScript_ResetAllBerries:: @ 827149D
-	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
-	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
-	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
-	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
-	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
-	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
-	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
-	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
-	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
-	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
-	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
-	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
-	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
-	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
-	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
-	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
-	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5
+	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
 	return
 
 EventScript_ResetAllMapFlags:: @ 82715DE
@@ -1038,7 +1045,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
-	setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
+	setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER
 	setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
 	setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
 	setflag FLAG_UNKNOWN_0x393
@@ -1392,50 +1399,50 @@ Std_ObtainItem:: @ 8271AD3
 EventScript_271AE3:: @ 8271AE3
 	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
 	checkitemtype VAR_0x8000
-	call EventScript_271B08
+	call EventScript_BufferStdString
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_271B95
 	compare VAR_0x8007, 0
 	call_if_eq EventScript_271BA9
 	return
 
-EventScript_271B08:: @ 8271B08
+EventScript_BufferStdString:: @ 8271B08
 	switch VAR_RESULT
-	case 1, EventScript_271B45
-	case 5, EventScript_271B55
-	case 2, EventScript_271B65
-	case 3, EventScript_271B75
-	case 4, EventScript_271B85
+	case POCKET_ITEMS, EventScript_StdStringItem
+	case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems
+	case POCKET_POKE_BALLS, EventScript_StdStringPokeballs
+	case POCKET_TM_HM, EventScript_StdStringTMHMS
+	case POCKET_BERRIES, EventScript_StdStringBerries
 	end
 
-EventScript_271B45:: @ 8271B45
-	bufferstdstring 2, 14
+EventScript_StdStringItem:: @ 8271B45
+	bufferstdstring 2, STDSTRING_ITEMS
 	compare VAR_0x8007, 1
-	call_if_eq EventScript_271BAF
+	call_if_eq EventScript_PlayFanfare4
 	return
 
-EventScript_271B55:: @ 8271B55
-	bufferstdstring 2, 15
+EventScript_StdStringKeyItems:: @ 8271B55
+	bufferstdstring 2, STDSTRING_KEYITEMS
 	compare VAR_0x8007, 1
-	call_if_eq EventScript_271BAF
+	call_if_eq EventScript_PlayFanfare4
 	return
 
-EventScript_271B65:: @ 8271B65
-	bufferstdstring 2, 16
+EventScript_StdStringPokeballs:: @ 8271B65
+	bufferstdstring 2, STDSTRING_POKEBALLS
 	compare VAR_0x8007, 1
-	call_if_eq EventScript_271BAF
+	call_if_eq EventScript_PlayFanfare4
 	return
 
-EventScript_271B75:: @ 8271B75
-	bufferstdstring 2, 17
+EventScript_StdStringTMHMS:: @ 8271B75
+	bufferstdstring 2, STDSTRING_TMHMS
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_271BB3
 	return
 
-EventScript_271B85:: @ 8271B85
-	bufferstdstring 2, 18
+EventScript_StdStringBerries:: @ 8271B85
+	bufferstdstring 2, STDSTRING_BERRIES
 	compare VAR_0x8007, 1
-	call_if_eq EventScript_271BAF
+	call_if_eq EventScript_PlayFanfare4
 	return
 
 EventScript_271B95:: @ 8271B95
@@ -1449,7 +1456,7 @@ EventScript_271BA9:: @ 8271BA9
 	setvar VAR_RESULT, 0
 	return
 
-EventScript_271BAF:: @ 8271BAF
+EventScript_PlayFanfare4:: @ 8271BAF
 	playfanfare MUS_FANFA4
 	return
 
@@ -1493,7 +1500,7 @@ Std_FindItem:: @ 8271BFD
 	copyvar VAR_0x8007, VAR_RESULT
 	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
 	checkitemtype VAR_0x8000
-	call EventScript_271B08
+	call EventScript_BufferStdString
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_PickItemUp
 	compare VAR_0x8007, 0
@@ -1504,7 +1511,7 @@ Std_FindItem:: @ 8271BFD
 EventScript_PickItemUp:: @ 8271C3A
 	removeobject VAR_LAST_TALKED
 	giveitem VAR_0x8004, VAR_0x8005
-	specialvar VAR_RESULT, sub_81398C0
+	specialvar VAR_RESULT, BufferTMHMMoveName
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, 1
 	call_if_eq EventScript_271C8F
@@ -1546,7 +1553,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
 	copyvar VAR_0x8007, VAR_RESULT
 	bufferitemnameplural 1, VAR_0x8005, 1
 	checkitemtype VAR_0x8005
-	call EventScript_271B08
+	call EventScript_BufferStdString
 	compare VAR_0x8007, 1
 	goto_if_eq EventScript_271CE8
 	compare VAR_0x8007, 0
@@ -1556,7 +1563,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
 EventScript_271CE8:: @ 8271CE8
 	copyvar VAR_0x8008, VAR_0x8004
 	copyvar VAR_0x8004, VAR_0x8005
-	specialvar VAR_RESULT, sub_81398C0
+	specialvar VAR_RESULT, BufferTMHMMoveName
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_271D0E
 	compare VAR_RESULT, 0
@@ -1627,7 +1634,7 @@ EventScript_PC:: @ 8271D92
 EventScript_271DAC:: @ 8271DAC
 	message gText_WhichPCShouldBeAccessed
 	waitmessage
-	special ScrSpecial_CreatePCMenu
+	special ScriptMenu_CreatePCMultichoice
 	waitstate
 	goto EventScript_271DBC
 	end
@@ -1638,7 +1645,7 @@ EventScript_271DBC:: @ 8271DBC
 	case 1, EventScript_271DF9
 	case 2, EventScript_271E54
 	case 3, EventScript_271E47
-	case 127, EventScript_271E47
+	case MULTI_B_PRESSED, EventScript_271E47
 	end
 
 EventScript_271DF9:: @ 8271DF9
@@ -2038,15 +2045,13 @@ Route101_EventScript_272184:: @ 8272184
 	msgbox gUnknown_082A633D, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_OutsideWest_EventScript_2721E2:: @ 82721E2
-LilycoveCity_Harbor_EventScript_2721E2:: @ 82721E2
-SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2
+Common_EventScript_FerryDepart:: @ 82721E2
 	delay 60
-	applymovement VAR_0x8004, SlateportCity_Harbor_Movement_2721F0
+	applymovement VAR_0x8004, Movement_FerryDepart
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_2721F0: @ 82721F0
+Movement_FerryDepart: @ 82721F0
 	walk_slow_right
 	walk_slow_right
 	walk_slow_right
@@ -2103,7 +2108,7 @@ SouthernIsland_Exterior_EventScript_272250:: @ 8272250
 	call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
-	call BattleFrontier_OutsideWest_EventScript_2721E2
+	call Common_EventScript_FerryDepart
 	return
 
 EventScript_272274:: @ 8272274
@@ -2895,34 +2900,34 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0
 MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0
 Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0
 RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0
-	bufferboxname 0, VAR_STORAGE_UNKNOWN
+	bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
 	bufferspeciesname 1, VAR_TEMP_1
 	call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB
 	call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB
-	specialvar VAR_RESULT, sub_813B21C
+	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4
 	msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4
-	specialvar VAR_RESULT, get_unknown_box_id
+	specialvar VAR_RESULT, GetPCBoxToSendMon
 	bufferboxname 2, VAR_RESULT
 	msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6
-	specialvar VAR_RESULT, sub_813B21C
+	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF
 	msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF
-	specialvar VAR_RESULT, get_unknown_box_id
+	specialvar VAR_RESULT, GetPCBoxToSendMon
 	bufferboxname 2, VAR_RESULT
 	msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT
 	return
@@ -2944,7 +2949,7 @@ EventScript_Questionnaire:: @ 827381B
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
-	specialvar VAR_0x8008, sub_813B490
+	specialvar VAR_0x8008, GetMartEmployeeObjectEventId
 	compare VAR_0x8004, 1
 	goto_if_eq EventScript_27386D
 	compare VAR_0x8004, 2
@@ -4015,7 +4020,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
 BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
 	message BattleFrontier_BattleTowerLobby_Text_27F7BA
 	waitmessage
-	multichoice 20, 8, 45, 1
+	multichoice 20, 8, MULTI_SATISFACTION, 1
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38
@@ -4207,7 +4212,7 @@ MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
 	.include "data/text/roulette.inc"
 	.include "data/text/pokedex_rating.inc"
 	.include "data/text/lottery_corner.inc"
-	.include "data/text/eon_ticket.inc"
+	.include "data/text/event_ticket_1.inc"
 	.include "data/text/braille.inc"
 	.include "data/text/berries.inc"
 	.include "data/text/shoal_cave.inc"
@@ -5548,17 +5553,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
 	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F
 	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	end
 
@@ -6302,77 +6307,7 @@ VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878
 	.string "The VERDANTURF BATTLE TENT\n"
 	.string "rules are listed.$"
 
-LilycoveCity_Harbor_Text_2C68A5: @ 82C68A5
-	.string "What's up, youngster?\p"
-	.string "What, it's you who's supposed to have\n"
-	.string "a tattered old map?\p"
-	.string "Let's have a look.\n"
-	.string "… … … … … …\p"
-	.string "Boy, this is quite a ways away.\n"
-	.string "I'm afraid I can't help you…$"
-
-LilycoveCity_Harbor_Text_2C6951: @ 82C6951
-	.string "BRINEY: Hold on a second!\p"
-	.string "What's the idea of turning down\n"
-	.string "someone that I owe so much to?$"
-
-LilycoveCity_Harbor_Text_2C69AA: @ 82C69AA
-	.string "{PLAYER}{KUN}, I'm terribly sorry.\p"
-	.string "You came to me seeking my help,\n"
-	.string "and we almost turned you away.\p"
-	.string "Well, let me make things right.\p"
-	.string "We'll sail right away, of course!\p"
-	.string "Let's find this island on\n"
-	.string "this OLD SEA MAP!$"
-
-LilycoveCity_Harbor_Text_2C6A71: @ 82C6A71
-	.string "Is it you who brought that odd\n"
-	.string "ticket?\p"
-	.string "Where you're trying to go is an island\n"
-	.string "that's far, far away.\p"
-	.string "No one knows what awaits there…\p"
-	.string "The very thought excites my blood\n"
-	.string "as a sailing man!\p"
-	.string "Get on board, youngster!$"
-
-FarawayIsland_Entrance_Text_2C6B42: @ 82C6B42
-	.string "CAPT. BRINEY can be so maddeningly\n"
-	.string "fickle…\p"
-	.string "Do you want to return to LILYCOVE?$"
-
-BirthIsland_Harbor_Text_2C6B90: @ 82C6B90
-	.string "What an oddly shaped island, eh?\n"
-	.string "Do you want to return to LILYCOVE?$"
-
-LilycoveCity_Harbor_Text_2C6BD4: @ 82C6BD4
-	.string "Is it you who brought those\n"
-	.string "odd tickets?\p"
-	.string "… … …Hm.\p"
-	.string "These tickets will get you to islands\n"
-	.string "that are far, far away.\p"
-	.string "No one knows what awaits there,\n"
-	.string "or what may happen there.\p"
-	.string "The very thought excites my blood\n"
-	.string "as a sailing man!\p"
-	.string "Get on board, youngster!\n"
-	.string "Where shall we sail first?$"
-
-NavelRock_Harbor_Text_2C6CE6: @ 82C6CE6
-	.string "Did… Did you hear that?\n"
-	.string "That low growling from deep in there.\p"
-	.string "Are you sure it's safe?\n"
-	.string "Do you think we should leave?$"
-
-FarawayIsland_Entrance_Text_2C6D5A: @ 82C6D5A
-	.string "The writing is fading as if it was\n"
-	.string "written a long time ago…\p"
-	.string "“…ber, 6th day\n"
-	.string "If any human…sets foot here…\l"
-	.string "again…et it be a kindhearted pers…\l"
-	.string "…ith that hope, I depar…”$"
-
-FarawayIsland_Interior_Text_2C6DFF: @ 82C6DFF
-	.string "Myuu…$"
+	.include "data/text/event_ticket_2.inc"
 
 MauvilleCity_Text_2C6E05: @ 82C6E05
 	.string "This move can be learned only\n"

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

@@ -169,30 +169,30 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E
 	message BattleFrontier_BattleArenaBattleRoom_Text_257F04
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4
@@ -208,11 +208,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA
 BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808
 	message BattleFrontier_BattleArenaBattleRoom_Text_257E9E
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A
 	closemessage
@@ -286,21 +286,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_242170

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
 
 BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
@@ -101,11 +101,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF
 	message BattleFrontier_BattleArenaLobby_Text_256B19
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF
 	case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255DBF
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255DBF
 
 BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA
 	call BattleFrontier_BattleArenaLobby_EventScript_23E8B4
@@ -140,20 +140,20 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4
 BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B
 	message BattleFrontier_BattleArenaLobby_Text_2561EA
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47
 	case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F
 	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB
 
 BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 	message BattleFrontier_BattleArenaLobby_Text_256513
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -377,14 +377,14 @@ BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA
 BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9
 	message BattleFrontier_BattleArenaLobby_Text_256DDF
 	waitmessage
-	multichoice 17, 2, 96, 0
+	multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C
 	case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A
 	case 2, BattleFrontier_BattleArenaLobby_EventScript_256148
 	case 3, BattleFrontier_BattleArenaLobby_EventScript_256156
 	case 4, BattleFrontier_BattleArenaLobby_EventScript_256164
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_256164
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_256164
 	end
 
 BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -880,71 +880,71 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
-	turnvobject 0, 4
-	turnvobject 2, 4
-	turnvobject 4, 4
-	turnvobject 6, 4
-	turnvobject 8, 4
-	turnvobject 10, 3
-	turnvobject 12, 3
-	turnvobject 14, 3
-	turnvobject 16, 3
-	turnvobject 18, 3
-	turnvobject 20, 4
-	turnvobject 22, 4
-	turnvobject 24, 4
-	turnvobject 26, 4
-	turnvobject 28, 4
-	turnvobject 30, 4
+	turnvobject 0, DIR_EAST
+	turnvobject 2, DIR_EAST
+	turnvobject 4, DIR_EAST
+	turnvobject 6, DIR_EAST
+	turnvobject 8, DIR_EAST
+	turnvobject 10, DIR_WEST
+	turnvobject 12, DIR_WEST
+	turnvobject 14, DIR_WEST
+	turnvobject 16, DIR_WEST
+	turnvobject 18, DIR_WEST
+	turnvobject 20, DIR_EAST
+	turnvobject 22, DIR_EAST
+	turnvobject 24, DIR_EAST
+	turnvobject 26, DIR_EAST
+	turnvobject 28, DIR_EAST
+	turnvobject 30, DIR_EAST
 	delay 20
-	turnvobject 0, 1
-	turnvobject 2, 1
-	turnvobject 4, 1
-	turnvobject 6, 1
-	turnvobject 8, 1
-	turnvobject 10, 1
-	turnvobject 12, 1
-	turnvobject 14, 1
-	turnvobject 16, 1
-	turnvobject 18, 1
-	turnvobject 20, 1
-	turnvobject 22, 1
-	turnvobject 24, 1
-	turnvobject 26, 1
-	turnvobject 28, 1
-	turnvobject 30, 1
+	turnvobject 0, DIR_SOUTH
+	turnvobject 2, DIR_SOUTH
+	turnvobject 4, DIR_SOUTH
+	turnvobject 6, DIR_SOUTH
+	turnvobject 8, DIR_SOUTH
+	turnvobject 10, DIR_SOUTH
+	turnvobject 12, DIR_SOUTH
+	turnvobject 14, DIR_SOUTH
+	turnvobject 16, DIR_SOUTH
+	turnvobject 18, DIR_SOUTH
+	turnvobject 20, DIR_SOUTH
+	turnvobject 22, DIR_SOUTH
+	turnvobject 24, DIR_SOUTH
+	turnvobject 26, DIR_SOUTH
+	turnvobject 28, DIR_SOUTH
+	turnvobject 30, DIR_SOUTH
 	delay 20
-	turnvobject 1, 4
-	turnvobject 3, 4
-	turnvobject 5, 4
-	turnvobject 7, 4
-	turnvobject 9, 4
-	turnvobject 11, 3
-	turnvobject 13, 3
-	turnvobject 15, 3
-	turnvobject 17, 3
-	turnvobject 19, 3
-	turnvobject 21, 4
-	turnvobject 23, 4
-	turnvobject 25, 4
-	turnvobject 27, 3
-	turnvobject 31, 3
+	turnvobject 1, DIR_EAST
+	turnvobject 3, DIR_EAST
+	turnvobject 5, DIR_EAST
+	turnvobject 7, DIR_EAST
+	turnvobject 9, DIR_EAST
+	turnvobject 11, DIR_WEST
+	turnvobject 13, DIR_WEST
+	turnvobject 15, DIR_WEST
+	turnvobject 17, DIR_WEST
+	turnvobject 19, DIR_WEST
+	turnvobject 21, DIR_EAST
+	turnvobject 23, DIR_EAST
+	turnvobject 25, DIR_EAST
+	turnvobject 27, DIR_WEST
+	turnvobject 31, DIR_WEST
 	delay 20
-	turnvobject 1, 1
-	turnvobject 3, 1
-	turnvobject 5, 1
-	turnvobject 7, 1
-	turnvobject 9, 1
-	turnvobject 11, 1
-	turnvobject 13, 1
-	turnvobject 15, 1
-	turnvobject 17, 1
-	turnvobject 19, 1
-	turnvobject 21, 1
-	turnvobject 23, 1
-	turnvobject 25, 1
-	turnvobject 27, 1
-	turnvobject 31, 1
+	turnvobject 1, DIR_SOUTH
+	turnvobject 3, DIR_SOUTH
+	turnvobject 5, DIR_SOUTH
+	turnvobject 7, DIR_SOUTH
+	turnvobject 9, DIR_SOUTH
+	turnvobject 11, DIR_SOUTH
+	turnvobject 13, DIR_SOUTH
+	turnvobject 15, DIR_SOUTH
+	turnvobject 17, DIR_SOUTH
+	turnvobject 19, DIR_SOUTH
+	turnvobject 21, DIR_SOUTH
+	turnvobject 23, DIR_SOUTH
+	turnvobject 25, DIR_SOUTH
+	turnvobject 27, DIR_SOUTH
+	turnvobject 31, DIR_SOUTH
 	delay 20
 	return
 

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
 
 BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
@@ -131,11 +131,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
 	message BattleFrontier_BattleDomeLobby_Text_24AE17
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9
 	case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_2499E9
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_2499E9
 
 BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4
 	call BattleFrontier_BattleDomeLobby_EventScript_23E8B4
@@ -193,20 +193,20 @@ BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
 	compare VAR_FRONTIER_BATTLE_MODE, 1
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF
 	case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA
 	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64
 
 BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 	message BattleFrontier_BattleDomeLobby_Text_24A210
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -503,13 +503,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
 BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43
 	message BattleFrontier_BattleDomeLobby_Text_24AE8B
 	waitmessage
-	multichoice 17, 4, 98, 0
+	multichoice 17, 4, MULTI_BATTLE_DOME_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B
 	case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99
 	case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7
 	case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249EB5
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249EB5
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
@@ -35,7 +35,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
-	multichoice 16, 0, 73, 1
+	multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
@@ -43,26 +43,26 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
 	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D
 	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
 	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1
-	multichoice 16, 2, 107, 1
+	multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
 	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
 	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
 	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4
@@ -78,11 +78,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
 	setvar VAR_0x8004, 12

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
 
 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
@@ -106,11 +106,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258582
 	message BattleFrontier_BattleFactoryLobby_Text_259388
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582
 	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_258582
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_258582
 
 BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D
 	call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4
@@ -166,20 +166,20 @@ BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
 	compare VAR_FRONTIER_BATTLE_MODE, 1
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653
 	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768
 	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D
 
 BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
 	message BattleFrontier_BattleFactoryLobby_Text_258BE9
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
@@ -347,7 +347,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839
 BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848
 	message BattleFrontier_BattleFactoryLobby_Text_259743
 	waitmessage
-	multichoice 17, 0, 99, 0
+	multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6
 	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4
@@ -355,7 +355,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848
 	case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0
 	case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE
 	case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
 	end
 
 BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -12,10 +12,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
 	compare VAR_0x8006, 1
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
 	setobjectxy 1, 8, 7
-	turnobject 1, 1
+	turnobject 1, DIR_SOUTH
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
@@ -118,30 +118,30 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
 	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
 	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
 	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4
@@ -157,11 +157,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
 	setvar VAR_0x8004, 12
@@ -422,21 +422,21 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
 	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
 	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
 	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -126,30 +126,30 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78
 	message BattleFrontier_BattlePalaceBattleRoom_Text_25009E
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4
@@ -165,11 +165,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2
 	message BattleFrontier_BattlePalaceBattleRoom_Text_25005A
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14
 	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
@@ -209,21 +209,21 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
@@ -101,11 +101,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
 	message BattleFrontier_BattlePalaceLobby_Text_24EF16
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907
 	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24D907
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24D907
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902
 	call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4
@@ -164,20 +164,20 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
 	compare VAR_FRONTIER_BATTLE_MODE, 1
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6
 	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20
 	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 	message BattleFrontier_BattlePalaceLobby_Text_24E119
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -406,7 +406,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6
 BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5
 	message BattleFrontier_BattlePalaceLobby_Text_24EF88
 	waitmessage
-	multichoice 16, 0, 100, 0
+	multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13
 	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21
@@ -414,7 +414,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5
 	case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D
 	case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B
 	case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
 
 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
 
 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
@@ -133,20 +133,20 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
 BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F
 	message BattleFrontier_BattlePikeLobby_Text_25BBC1
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB
 	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A
 	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
 
 BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 	message BattleFrontier_BattlePikeLobby_Text_25BE35
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -297,13 +297,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6
 BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5
 	message BattleFrontier_BattlePikeLobby_Text_25C621
 	waitmessage
-	multichoice 16, 4, 102, 0
+	multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D
 	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B
 	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39
 	case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BB47
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BB47
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D

data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc

@@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
 
 BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
 	setvar VAR_TEMP_4, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2

data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc

@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
 
 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
 	setvar VAR_TEMP_4, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
 	setvar VAR_TEMP_4, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
@@ -159,7 +159,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
 	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
 	release

data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc

@@ -3,17 +3,17 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT
-	special sub_813A958
+	special ShowBattlePointsWindow
 	return
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A
-	specialvar VAR_TEMP_1, sub_813AA04
+	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT
@@ -39,9 +39,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
 	copyvar VAR_0x8004, VAR_0x8008
-	special sub_813A9A4
+	special TakeFrontierBattlePoints
 	givedecoration VAR_0x8009
-	special sub_813A8FC
+	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT
 	compare VAR_TEMP_2, 0
@@ -51,7 +51,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	end
 
@@ -60,9 +60,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
 	copyvar VAR_0x8004, VAR_0x8008
-	special sub_813A9A4
+	special TakeFrontierBattlePoints
 	giveitem VAR_0x8009, 1
-	special sub_813A8FC
+	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT
 	compare VAR_TEMP_2, 2
@@ -72,7 +72,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	end
 
@@ -85,11 +85,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
-	setvar VAR_0x8004, 3
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241
@@ -102,7 +102,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
 	case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336
 	case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359
 	case 10, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
+	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
@@ -110,7 +110,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 16
-	setvar VAR_0x8009, 75
+	setvar VAR_0x8009, DECOR_KISS_POSTER
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -119,7 +119,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, 103
+	setvar VAR_0x8009, DECOR_KISS_CUSHION
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -128,7 +128,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, 87
+	setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -137,7 +137,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 79
+	setvar VAR_0x8009, DECOR_TOGEPI_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -146,7 +146,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 84
+	setvar VAR_0x8009, DECOR_MEOWTH_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -155,7 +155,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 85
+	setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -164,7 +164,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 86
+	setvar VAR_0x8009, DECOR_DITTO_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -173,7 +173,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, 80
+	setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -182,7 +182,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, 81
+	setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -191,7 +191,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, 82
+	setvar VAR_0x8009, DECOR_TOTODILE_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -204,11 +204,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
-	setvar VAR_0x8004, 4
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413
@@ -216,7 +216,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
 	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459
 	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C
 	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
+	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
@@ -224,7 +224,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, 113
+	setvar VAR_0x8009, DECOR_LAPRAS_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -233,7 +233,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, 111
+	setvar VAR_0x8009, DECOR_SNORLAX_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -242,7 +242,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, 114
+	setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -251,7 +251,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, 115
+	setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -260,7 +260,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, 116
+	setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -273,11 +273,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
-	setvar VAR_0x8004, 5
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541
@@ -286,7 +286,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
 	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA
 	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD
 	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
+	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
@@ -294,7 +294,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 64
+	setvar VAR_0x8009, ITEM_PROTEIN
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -303,7 +303,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 67
+	setvar VAR_0x8009, ITEM_CALCIUM
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -312,7 +312,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 65
+	setvar VAR_0x8009, ITEM_IRON
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -321,7 +321,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 70
+	setvar VAR_0x8009, ITEM_ZINC
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -330,7 +330,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 66
+	setvar VAR_0x8009, ITEM_CARBOS
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -339,7 +339,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 63
+	setvar VAR_0x8009, ITEM_HP_UP
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -352,11 +352,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
-	setvar VAR_0x8004, 6
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3
@@ -368,7 +368,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
 	case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785
 	case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8
 	case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
+	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
@@ -376,7 +376,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 200
+	setvar VAR_0x8009, ITEM_LEFTOVERS
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -385,7 +385,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 180
+	setvar VAR_0x8009, ITEM_WHITE_HERB
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -394,7 +394,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 183
+	setvar VAR_0x8009, ITEM_QUICK_CLAW
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -403,7 +403,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 185
+	setvar VAR_0x8009, ITEM_MENTAL_HERB
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -412,7 +412,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 179
+	setvar VAR_0x8009, ITEM_BRIGHT_POWDER
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -421,7 +421,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 186
+	setvar VAR_0x8009, ITEM_CHOICE_BAND
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -430,7 +430,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 187
+	setvar VAR_0x8009, ITEM_KINGS_ROCK
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -439,7 +439,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 196
+	setvar VAR_0x8009, ITEM_FOCUS_BAND
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -448,7 +448,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 198
+	setvar VAR_0x8009, ITEM_SCOPE_LENS
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
 
 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
@@ -137,20 +137,20 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
 BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8
 	message BattleFrontier_BattlePyramidLobby_Text_250FA7
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 
 BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 	message BattleFrontier_BattlePyramidLobby_Text_251248
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -269,12 +269,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250B27
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250B27
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
@@ -318,7 +318,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
 
 BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4
 	copyvar VAR_0x8004, VAR_RESULT
-	special sub_813B968
+	special GetBattlePyramidHint
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97
@@ -508,12 +508,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09
-	multichoice 17, 6, 83, 0
+	multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250E60
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250E60
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40
@@ -562,14 +562,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95
 BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4
 	message BattleFrontier_BattlePyramidLobby_Text_2526D9
 	waitmessage
-	multichoice 15, 2, 101, 0
+	multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13
 	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21
 	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
 
 BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	compare VAR_TEMP_C, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3
 	setobjectxyperm 2, 0, 0

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -99,30 +99,30 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40
 	message BattleFrontier_BattleTowerBattleRoom_Text_2423A3
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4
@@ -138,11 +138,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA
 	message BattleFrontier_BattleTowerBattleRoom_Text_24244C
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
 	closemessage
@@ -256,21 +256,21 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_242170

data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc

@@ -15,7 +15,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
 	setvar VAR_0x8004, 14
 	special sub_8161F74
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
 	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
 	return
@@ -25,7 +25,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
 	return
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
-	special sub_813A76C
+	special SetBattleTowerLinkPlayerGfx
 	return
 
 BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
@@ -173,30 +173,30 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
-	multichoice 19, 4, 103, 1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
 	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
 	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
 	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
 	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
@@ -207,16 +207,16 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
 	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
 	closemessage
@@ -350,20 +350,20 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
 	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
-	multichoice 19, 6, 105, 1
+	multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
 	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
-	multichoice 20, 8, 106, 1
+	multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
@@ -381,10 +381,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
 	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
 	setflag FLAG_TEMP_2
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
@@ -393,7 +393,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
 	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143

data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc

@@ -15,7 +15,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
 	setvar VAR_0x8004, 14
 	special sub_8161F74
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
 	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
 	return
@@ -25,7 +25,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
 	return
 
 BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
-	special sub_813A76C
+	special SetBattleTowerLinkPlayerGfx
 	return
 
 BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -12,9 +12,9 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
 	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A
 	waitmovement 0
-	special sub_813A080
+	special BufferBattleTowerElevatorFloors
 	waitse
-	special ShakeScreenInElevator
+	special MoveElevator
 	waitstate
 	delay 48
 	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
@@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
 
 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
 
 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
@@ -162,11 +162,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF
 	message BattleFrontier_BattleTowerLobby_Text_23FE3C
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4
 BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4
@@ -244,21 +244,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
 BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948
 	message BattleFrontier_BattleTowerLobby_Text_2405B3
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -324,21 +324,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F
 BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1
 	message BattleFrontier_BattleTowerLobby_Text_24085E
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
 	setvar VAR_FRONTIER_BATTLE_MODE, 1
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -405,21 +405,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
 BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D
 	message BattleFrontier_BattleTowerLobby_Text_240B06
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
 	setvar VAR_FRONTIER_BATTLE_MODE, 2
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -485,21 +485,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74
 BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86
 	message BattleFrontier_BattleTowerLobby_Text_240E95
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
 	setvar VAR_FRONTIER_BATTLE_MODE, 3
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
-	multichoice 17, 6, 24, 0
+	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	setvar VAR_0x8004, 15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
@@ -560,13 +560,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
 	faceplayer
 	message BattleFrontier_BattleTowerLobby_Text_23F8CD
 	waitmessage
-	multichoice 16, 4, 109, 0
+	multichoice 16, 4, MULTI_BATTLE_TOWER_FEELINGS, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66
 	case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23EF80
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23EF80
 	release
 	end
 
@@ -816,19 +816,19 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
-	bufferstdstring 0, 19
+	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9
-	bufferstdstring 0, 20
+	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE
-	bufferstdstring 0, 21
+	bufferstdstring 0, STDSTRING_MULTI
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
-	bufferstdstring 0, 22
+	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
@@ -1022,12 +1022,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
 BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
 	message BattleFrontier_BattleTowerLobby_Text_2792CD
 	waitmessage
-	multichoice 16, 6, 81, 0
+	multichoice 16, 6, MULTI_LINK_LEADER, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
@@ -1080,14 +1080,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE
 BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD
 	message BattleFrontier_BattleTowerLobby_Text_241563
 	waitmessage
-	multichoice 17, 2, 97, 0
+	multichoice 17, 2, MULTI_BATTLE_TOWER_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C
 	case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A
 	case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F558
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F558
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
 	.2byte 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23
@@ -86,7 +86,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
 	faceplayer
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT
@@ -180,10 +180,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
 	setvar VAR_0x8005, 2
 	special sub_8161F74
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	case 127, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
 	setvar VAR_0x8004, 11
 	setvar VAR_0x8005, 3
 	special sub_8161F74

data/maps/BattleFrontier_Lounge1/scripts.inc

@@ -29,9 +29,9 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
 
 BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, 412
+	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF
-	special sub_8139D98
+	special BufferVarsForIVRater
 	compare VAR_0x8005, 90
 	goto_if_le BattleFrontier_Lounge1_EventScript_25E87F
 	compare VAR_0x8005, 120

data/maps/BattleFrontier_Lounge2/scripts.inc

@@ -40,7 +40,7 @@ BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
 	call_if_le BattleFrontier_Lounge2_EventScript_2606F8
 	compare VAR_FRONTIER_MANIAC_FACILITY, 4
 	call_if_ge BattleFrontier_Lounge2_EventScript_260701
-	special sub_8139F20
+	special ShowFrontierManiacMessage
 	waitmessage
 	waitbuttonpress
 	release
@@ -55,43 +55,43 @@ BattleFrontier_Lounge2_EventScript_260701:: @ 8260701
 	return
 
 BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A
-	bufferstdstring 0, 19
+	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
 BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F
-	bufferstdstring 0, 20
+	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
 BattleFrontier_Lounge2_EventScript_260714:: @ 8260714
-	bufferstdstring 0, 21
+	bufferstdstring 0, STDSTRING_MULTI
 	return
 
 BattleFrontier_Lounge2_EventScript_260719:: @ 8260719
-	bufferstdstring 0, 22
+	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
 BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E
-	bufferstdstring 0, 24
+	bufferstdstring 0, STDSTRING_BATTLE_DOME
 	return
 
 BattleFrontier_Lounge2_EventScript_260723:: @ 8260723
-	bufferstdstring 0, 25
+	bufferstdstring 0, STDSTRING_BATTLE_FACTORY
 	return
 
 BattleFrontier_Lounge2_EventScript_260728:: @ 8260728
-	bufferstdstring 0, 26
+	bufferstdstring 0, STDSTRING_BATTLE_PALACE
 	return
 
 BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D
-	bufferstdstring 0, 27
+	bufferstdstring 0, STDSTRING_BATTLE_ARENA
 	return
 
 BattleFrontier_Lounge2_EventScript_260732:: @ 8260732
-	bufferstdstring 0, 28
+	bufferstdstring 0, STDSTRING_BATTLE_PIKE
 	return
 
 BattleFrontier_Lounge2_EventScript_260737:: @ 8260737
-	bufferstdstring 0, 29
+	bufferstdstring 0, STDSTRING_BATTLE_PYRAMID
 	return
 
 BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C

data/maps/BattleFrontier_Lounge3/scripts.inc

@@ -14,7 +14,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
 	end
 
 BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
-	special sub_813A820
+	special ShowFrontierGamblerLookingMessage
 	waitmessage
 	waitbuttonpress
 	msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO
@@ -25,19 +25,19 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
 	goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
 	message BattleFrontier_Lounge3_Text_262B42
 	waitmessage
-	special sub_813A958
+	special ShowBattlePointsWindow
 	goto BattleFrontier_Lounge3_EventScript_261DE9
 	end
 
 BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
-	multichoice 20, 4, 87, 0
+	multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, 0
 	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge3_EventScript_261E30
-	case 1, BattleFrontier_Lounge3_EventScript_261E3B
-	case 2, BattleFrontier_Lounge3_EventScript_261E46
-	case 3, BattleFrontier_Lounge3_EventScript_261FAF
-	case 127, BattleFrontier_Lounge3_EventScript_261FAF
+	case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_261E30
+	case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_261E3B
+	case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_261E46
+	case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_261FAF
+	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_261FAF
 	end
 
 BattleFrontier_Lounge3_EventScript_261E30:: @ 8261E30
@@ -56,7 +56,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
 	end
 
 BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
-	specialvar VAR_TEMP_1, sub_813AA04
+	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
 	msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
@@ -67,19 +67,19 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
 
 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
 	copyvar VAR_0x8004, VAR_0x8008
-	special sub_813A9A4
-	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
-	special sub_813A8FC
+	special TakeFrontierBattlePoints
+	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
+	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_261E96
 	end
 
 BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
-	special sub_813A854
+	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	end
 
@@ -105,37 +105,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
 
 BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
 	msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT
-	compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
+	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	goto_if_ge BattleFrontier_Lounge3_EventScript_261F12
 	goto BattleFrontier_Lounge3_EventScript_261DAF
 	end
 
 BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
-	compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
+	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E
-	compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2
+	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
 	goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E
 	goto BattleFrontier_Lounge3_EventScript_261F71
 	end
 
 BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
 	msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT
-	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0
+	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5
 	call_if_eq BattleFrontier_Lounge3_EventScript_261F80
-	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1
+	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_10
 	call_if_eq BattleFrontier_Lounge3_EventScript_261F8A
-	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
+	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_15
 	call_if_eq BattleFrontier_Lounge3_EventScript_261F94
 	msgbox BattleFrontier_Lounge3_Text_2633D4, 9
-	special sub_813A9D0
+	special GiveFrontierBattlePoints
 	msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
-	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
+	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
 BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
 	msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT
-	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
+	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
@@ -155,7 +155,7 @@ BattleFrontier_Lounge3_EventScript_261F94:: @ 8261F94
 	return
 
 BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E
-	special sub_813A854
+	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
 	release
@@ -167,7 +167,7 @@ BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5
 	end
 
 BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF
-	special sub_813A988
+	special CloseBattlePointsWindow
 	goto BattleFrontier_Lounge3_EventScript_261FA5
 	end
 

data/maps/BattleFrontier_Lounge5/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_2645C6",
+      "script": "BattleFrontier_Lounge5_EventScript_NatureGirl",
       "flag": "0"
     },
     {

data/maps/BattleFrontier_Lounge5/scripts.inc

@@ -1,34 +1,34 @@
 BattleFrontier_Lounge5_MapScripts:: @ 82645C5
 	.byte 0
 
-BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6
+BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO
+	msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge5_EventScript_26460D
+	goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
 	special sub_81B94B0
 	waitstate
 	lock
 	faceplayer
 	compare VAR_0x8004, 255
-	goto_if_eq BattleFrontier_Lounge5_EventScript_26460D
+	goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, 412
-	goto_if_eq BattleFrontier_Lounge5_EventScript_264603
-	special sub_813A7B8
+	compare VAR_RESULT, SPECIES_EGG
+	goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlEgg
+	special ShowNatureGirlMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_264603:: @ 8264603
-	msgbox BattleFrontier_Lounge5_Text_264EEE, MSGBOX_DEFAULT
+BattleFrontier_Lounge5_EventScript_NatureGirlEgg:: @ 8264603
+	msgbox BattleFrontier_Lounge5_Text_NatureGirlEgg, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D
-	msgbox BattleFrontier_Lounge5_Text_26467F, MSGBOX_DEFAULT
+BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown:: @ 826460D
+	msgbox BattleFrontier_Lounge5_Text_NatureGirlNoneShown, MSGBOX_DEFAULT
 	release
 	end
 
@@ -44,149 +44,149 @@ BattleFrontier_Lounge5_EventScript_264629:: @ 8264629
 	msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_Text_264632:: @ 8264632
+BattleFrontier_Lounge5_Text_NatureGirlGreeting:: @ 8264632
 	.string "Ehehe!\n"
 	.string "I can tell what POKéMON are thinking!\p"
 	.string "Please!\n"
 	.string "Can I see your POKéMON?$"
 
-BattleFrontier_Lounge5_Text_26467F:: @ 826467F
+BattleFrontier_Lounge5_Text_NatureGirlNoneShown:: @ 826467F
 	.string "Boo!\n"
 	.string "Cheapie!$"
 
-BattleFrontier_Lounge5_Text_26468D:: @ 826468D
+BattleFrontier_Lounge5_Text_NatureGirlHardy:: @ 826468D
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_2646E5:: @ 82646E5
+BattleFrontier_Lounge5_Text_NatureGirlLonely:: @ 82646E5
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_264741:: @ 8264741
+BattleFrontier_Lounge5_Text_NatureGirlBrave:: @ 8264741
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_2647A4:: @ 82647A4
+BattleFrontier_Lounge5_Text_NatureGirlAdamant:: @ 82647A4
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_2647FC:: @ 82647FC
+BattleFrontier_Lounge5_Text_NatureGirlNaughty:: @ 82647FC
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_264858:: @ 8264858
+BattleFrontier_Lounge5_Text_NatureGirlBold:: @ 8264858
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_2648BE:: @ 82648BE
+BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky:: @ 82648BE
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264916:: @ 8264916
+BattleFrontier_Lounge5_Text_NatureGirlRelaxed:: @ 8264916
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_264972:: @ 8264972
+BattleFrontier_Lounge5_Text_NatureGirlImpish:: @ 8264972
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_2649D5:: @ 82649D5
+BattleFrontier_Lounge5_Text_NatureGirlLax:: @ 82649D5
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264A3F:: @ 8264A3F
+BattleFrontier_Lounge5_Text_NatureGirlTimid:: @ 8264A3F
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_264A9B:: @ 8264A9B
+BattleFrontier_Lounge5_Text_NatureGirlHasty:: @ 8264A9B
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264AF3:: @ 8264AF3
+BattleFrontier_Lounge5_Text_NatureGirlSerious:: @ 8264AF3
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264B5D:: @ 8264B5D
+BattleFrontier_Lounge5_Text_NatureGirlJolly:: @ 8264B5D
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_264BC3:: @ 8264BC3
+BattleFrontier_Lounge5_Text_NatureGirlModest:: @ 8264BC3
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself whether\l"
 	.string "or not it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264C36:: @ 8264C36
+BattleFrontier_Lounge5_Text_NatureGirlMild:: @ 8264C36
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_264C95:: @ 8264C95
+BattleFrontier_Lounge5_Text_NatureGirlBashful:: @ 8264C95
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264D01:: @ 8264D01
+BattleFrontier_Lounge5_Text_NatureGirlRash:: @ 8264D01
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264D6B:: @ 8264D6B
+BattleFrontier_Lounge5_Text_NatureGirlCalm:: @ 8264D6B
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_264DD7:: @ 8264DD7
+BattleFrontier_Lounge5_Text_NatureGirlGentle:: @ 8264DD7
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_264E33:: @ 8264E33
+BattleFrontier_Lounge5_Text_NatureGirlSassy:: @ 8264E33
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F
+BattleFrontier_Lounge5_Text_NatureGirlCareful:: @ 8264E8F
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE
+BattleFrontier_Lounge5_Text_NatureGirlEgg:: @ 8264EEE
 	.string "That's silly! An EGG is asleep!\n"
 	.string "I can't talk to it!$"
 

data/maps/BattleFrontier_Lounge7/scripts.inc

@@ -19,11 +19,11 @@ BattleFrontier_Lounge7_EventScript_265276:: @ 8265276
 BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
 	message BattleFrontier_Lounge7_Text_2658EF
 	waitmessage
-	special sub_813A958
+	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 0
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
 	setvar VAR_0x8006, 0
-	special sub_813A128
+	special ShowScrollableMultichoice
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
@@ -38,16 +38,16 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
 	case 8, BattleFrontier_Lounge7_EventScript_26542F
 	case 9, BattleFrontier_Lounge7_EventScript_26543A
 	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case 127, BattleFrontier_Lounge7_EventScript_265635
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
 	end
 
 BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
 	message BattleFrontier_Lounge7_Text_2658EF
 	waitmessage
 	setvar VAR_TEMP_E, 0
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
 	setvar VAR_0x8006, 1
-	special sub_813A128
+	special ShowScrollableMultichoice
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
@@ -62,7 +62,7 @@ BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
 	case 8, BattleFrontier_Lounge7_EventScript_26542F
 	case 9, BattleFrontier_Lounge7_EventScript_26543A
 	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case 127, BattleFrontier_Lounge7_EventScript_265635
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
 	end
 
 BattleFrontier_Lounge7_EventScript_2653D7:: @ 82653D7
@@ -133,11 +133,11 @@ BattleFrontier_Lounge7_EventScript_265466:: @ 8265466
 BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
 	message BattleFrontier_Lounge7_Text_2658EF
 	waitmessage
-	special sub_813A958
+	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 1
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
 	setvar VAR_0x8006, 0
-	special sub_813A128
+	special ShowScrollableMultichoice
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
@@ -152,16 +152,16 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
 	case 8, BattleFrontier_Lounge7_EventScript_26561F
 	case 9, BattleFrontier_Lounge7_EventScript_26562A
 	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case 127, BattleFrontier_Lounge7_EventScript_265635
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
 	end
 
 BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
 	message BattleFrontier_Lounge7_Text_2658EF
 	waitmessage
 	setvar VAR_TEMP_E, 1
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
 	setvar VAR_0x8006, 1
-	special sub_813A128
+	special ShowScrollableMultichoice
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
@@ -176,7 +176,7 @@ BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
 	case 8, BattleFrontier_Lounge7_EventScript_26561F
 	case 9, BattleFrontier_Lounge7_EventScript_26562A
 	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case 127, BattleFrontier_Lounge7_EventScript_265635
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
 	end
 
 BattleFrontier_Lounge7_EventScript_2655C7:: @ 82655C7
@@ -230,8 +230,8 @@ BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A
 	end
 
 BattleFrontier_Lounge7_EventScript_265635:: @ 8265635
-	special sub_813ADB8
-	special sub_813A988
+	special CloseBattleFrontierTutorWindow
+	special CloseBattlePointsWindow
 	msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT
 	release
 	end
@@ -241,16 +241,18 @@ BattleFrontier_Lounge7_EventScript_265645:: @ 8265645
 	release
 	end
 
+@ VAR_0x8004 here is used to determine which move name to buffer
+@ VAR_0x8005 here is used to determine which move tutor was spoken to
 BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
 	copyvar VAR_0x8004, VAR_TEMP_D
 	copyvar VAR_0x8005, VAR_TEMP_E
-	special sub_813AC7C
+	special BufferBattleFrontierTutorMoveName
 	buffernumberstring 1, VAR_0x8008
 	copyvar VAR_0x8004, VAR_TEMP_C
 	msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA
-	specialvar VAR_TEMP_1, sub_813AA04
+	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_Lounge7_EventScript_265696
 	msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT
@@ -259,17 +261,17 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
 
 BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
 	msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT
-	special sub_813AEB4
+	special GetBattleFrontierTutorMoveIndex
 	fadescreen 1
-	special sub_813A988
-	special sub_813ADB8
+	special CloseBattlePointsWindow
+	special CloseBattleFrontierTutorWindow
 	special sub_81B892C
 	waitstate
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_Lounge7_EventScript_265645
 	msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT
 	copyvar VAR_0x8004, VAR_0x8008
-	special sub_813A9A4
+	special TakeFrontierBattlePoints
 	release
 	end
 

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -20,12 +20,12 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416
-	multichoicedefault 18, 6, 53, 2, 0
+	multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_OutsideWest_EventScript_23D458
 	case 1, BattleFrontier_OutsideWest_EventScript_23D483
 	case 2, BattleFrontier_OutsideWest_EventScript_23D4D8
-	case 127, BattleFrontier_OutsideWest_EventScript_23D4D8
+	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_23D4D8
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E

data/maps/BattleFrontier_ReceptionGate/scripts.inc

@@ -136,8 +136,8 @@ BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
 BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
 	message BattleFrontier_ReceptionGate_Text_26689D
 	waitmessage
-	setvar VAR_0x8004, 8
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
+	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
 	case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
@@ -150,7 +150,7 @@ BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
 	case 7, BattleFrontier_ReceptionGate_EventScript_266410
 	case 8, BattleFrontier_ReceptionGate_EventScript_26641E
 	case 9, BattleFrontier_ReceptionGate_EventScript_26642C
-	case 127, BattleFrontier_ReceptionGate_EventScript_26642C
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_26642C
 	end
 
 BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE
@@ -213,7 +213,7 @@ BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436
 BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446
 	message BattleFrontier_ReceptionGate_Text_266EE0
 	waitmessage
-	multichoice 15, 0, 95, 0
+	multichoice 15, 0, MULTI_FRONTIER_RULES, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_ReceptionGate_EventScript_2664A4
 	case 1, BattleFrontier_ReceptionGate_EventScript_2664B2
@@ -221,7 +221,7 @@ BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446
 	case 3, BattleFrontier_ReceptionGate_EventScript_2664CE
 	case 4, BattleFrontier_ReceptionGate_EventScript_2664DC
 	case 5, BattleFrontier_ReceptionGate_EventScript_2664EA
-	case 127, BattleFrontier_ReceptionGate_EventScript_2664EA
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_2664EA
 	end
 
 BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4
@@ -264,13 +264,13 @@ BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4
 BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504
 	message BattleFrontier_ReceptionGate_Text_26737C
 	waitmessage
-	multichoice 16, 4, 11, 0
+	multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, 0
 	switch VAR_RESULT
 	case 0, BattleFrontier_ReceptionGate_EventScript_26654C
 	case 1, BattleFrontier_ReceptionGate_EventScript_26655A
 	case 2, BattleFrontier_ReceptionGate_EventScript_266568
 	case 3, BattleFrontier_ReceptionGate_EventScript_266576
-	case 127, BattleFrontier_ReceptionGate_EventScript_266576
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_266576
 	end
 
 BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -112,7 +112,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
 
 BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
 	msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT
-	givedecoration_std 42
+	givedecoration_std DECOR_SILVER_SHIELD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
 	setflag FLAG_RECEIVED_SILVER_SHIELD
@@ -155,7 +155,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
 
 BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
 	msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT
-	givedecoration_std 43
+	givedecoration_std DECOR_GOLD_SHIELD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
 	setflag FLAG_RECEIVED_GOLD_SHIELD
@@ -218,7 +218,7 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9
 	end
 
 BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
-	special sub_813A9D0
+	special GiveFrontierBattlePoints
 	msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
 	msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
 	setflag FLAG_SCOTT_GIVES_BATTLE_POINTS

data/maps/BirthIsland_Harbor/scripts.inc

@@ -4,10 +4,10 @@ BirthIsland_Harbor_MapScripts:: @ 826805C
 BirthIsland_Harbor_EventScript_26805D:: @ 826805D
 	lock
 	faceplayer
-	msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO
+	msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq BirthIsland_Harbor_EventScript_2680A2
-	msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
@@ -21,7 +21,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
 	end
 
 BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2
-	msgbox BirthIsland_Harbor_Text_2A6A82, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 

data/maps/CaveOfOrigin_B1F/scripts.inc

@@ -22,7 +22,7 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
 	goto CaveOfOrigin_B1F_EventScript_2357F0
 
 CaveOfOrigin_B1F_EventScript_2357F0:: @ 82357F0
-	multichoice 0, 0, 110, 0
+	multichoice 0, 0, MULTI_WHERES_RAYQUAZA, 0
 	switch VAR_RESULT
 	case 0, CaveOfOrigin_B1F_EventScript_23582C
 	case 1, CaveOfOrigin_B1F_EventScript_235837

data/maps/DewfordTown/scripts.inc

@@ -12,12 +12,12 @@ DewfordTown_EventScript_1E9511:: @ 81E9511
 	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585
 	message DewfordTown_Text_1E9C8A
 	waitmessage
-	multichoicedefault 21, 6, 0, 2, 0
+	multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0
 	switch VAR_RESULT
 	case 0, DewfordTown_EventScript_1E955A
 	case 1, DewfordTown_EventScript_1E956A
 	case 2, DewfordTown_EventScript_1E957A
-	case 127, DewfordTown_EventScript_1E957A
+	case MULTI_B_PRESSED, DewfordTown_EventScript_1E957A
 	end
 
 DewfordTown_EventScript_1E955A:: @ 81E955A
@@ -97,7 +97,7 @@ DewfordTown_EventScript_1E9620:: @ 81E9620
 DewfordTown_EventScript_1E962A:: @ 81E962A
 	message DewfordTown_Text_1E9FB8
 	waitmessage
-	multichoice 20, 8, 50, 1
+	multichoice 20, 8, MULTI_HOWS_FISHING, 1
 	compare VAR_RESULT, 0
 	goto_if_eq DewfordTown_EventScript_1E964C
 	compare VAR_RESULT, 1

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
 	.2byte 0
 
 EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
 	.2byte 0
 
 EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
 	.2byte 0
 
 EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431

data/maps/EverGrandeCity_Hall1/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
 	.2byte 0
 
 EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall2/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
 	.2byte 0
 
 EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall3/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
 	.2byte 0
 
 EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall4/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
 	.2byte 0
 
 EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall5/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
 	.2byte 0
 
 EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_HallOfFame/scripts.inc

@@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
 	.2byte 0
 
 EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846

data/maps/EverGrandeCity_PhoebesRoom/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
 	.2byte 0
 
 EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193

data/maps/EverGrandeCity_SidneysRoom/scripts.inc

@@ -30,7 +30,7 @@ EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E
 	.2byte 0
 
 EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D

data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc

@@ -120,7 +120,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
 	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43
 	compare VAR_RESULT, 2
 	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A
-	multichoice 20, 6, 104, 1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8
 	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78
@@ -136,11 +136,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78
 FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6
 	message FallarborTown_BattleTentBattleRoom_Text_257E9E
 	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
 	case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E
-	case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
 
 FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8
 	closemessage

data/maps/FallarborTown_BattleTentLobby/scripts.inc

@@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
 
 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
@@ -140,12 +140,12 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
 FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
 	message FallarborTown_BattleTentLobby_Text_2C4843
 	waitmessage
-	multichoice 17, 6, 23, 0
+	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentLobby_EventScript_20005D
 	case 1, FallarborTown_BattleTentLobby_EventScript_200169
 	case 2, FallarborTown_BattleTentLobby_EventScript_2001C5
-	case 127, FallarborTown_BattleTentLobby_EventScript_2001C5
+	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C5
 
 FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
 	setvar VAR_FRONTIER_FACILITY, 3
@@ -315,7 +315,7 @@ FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F
 FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E
 	message FallarborTown_BattleTentLobby_Text_256DDF
 	waitmessage
-	multichoice 17, 0, 112, 0
+	multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentLobby_EventScript_2002BC
 	case 1, FallarborTown_BattleTentLobby_EventScript_2002CA
@@ -323,7 +323,7 @@ FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E
 	case 3, FallarborTown_BattleTentLobby_EventScript_2002E6
 	case 4, FallarborTown_BattleTentLobby_EventScript_2002F4
 	case 5, FallarborTown_BattleTentLobby_EventScript_200302
-	case 127, FallarborTown_BattleTentLobby_EventScript_200302
+	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_200302
 	end
 
 FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC

data/maps/FarawayIsland_Entrance/scripts.inc

@@ -19,10 +19,10 @@ FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
 FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
 	lock
 	faceplayer
-	msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO
+	msgbox FarawayIsland_Entrance_Text_SailorReturn, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
-	msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
@@ -36,11 +36,11 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
 	end
 
 FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7
-	msgbox FarawayIsland_Entrance_Text_2A6A82, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 
 FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1
-	msgbox FarawayIsland_Entrance_Text_2C6D5A, MSGBOX_SIGN
+	msgbox FarawayIsland_Entrance_Text_Sign, MSGBOX_SIGN
 	end
 

data/maps/FarawayIsland_Interior/scripts.inc

@@ -122,7 +122,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	waitmovement 0
 	setvar VAR_0x8004, 0
 	special sub_81D4A90
-	message FarawayIsland_Interior_Text_2C6DFF
+	message FarawayIsland_Interior_Text_Mew
 	waitse
 	playmoncry SPECIES_MEW, 2
 	compare VAR_FACING, 2

data/maps/FortreeCity_House2/scripts.inc

@@ -7,15 +7,15 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB
 	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E
 	call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862
 	msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT
-	multichoice 21, 8, 54, 1
+	multichoice 21, 8, MULTI_RIGHTLEFT, 1
 	switch VAR_RESULT
 	case 1, FortreeCity_House2_EventScript_217878
 	msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT
-	multichoice 21, 8, 54, 1
+	multichoice 21, 8, MULTI_RIGHTLEFT, 1
 	switch VAR_RESULT
 	case 1, FortreeCity_House2_EventScript_217878
 	msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT
-	multichoice 21, 8, 54, 1
+	multichoice 21, 8, MULTI_RIGHTLEFT, 1
 	switch VAR_RESULT
 	case 0, FortreeCity_House2_EventScript_217878
 	msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT

data/maps/LilycoveCity/scripts.inc

@@ -37,7 +37,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
 	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
 	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
 	random 10
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -630,12 +630,12 @@ LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806
 LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819
 	message LilycoveCity_ContestLobby_Text_27C0F6
 	waitmessage
-	multichoice 0, 0, 2, 0
+	multichoice 0, 0, MULTI_ENTERINFO, 0
 	switch VAR_RESULT
 	case 0, LilycoveCity_ContestLobby_EventScript_21A856
 	case 1, LilycoveCity_ContestLobby_EventScript_21A90D
 	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
@@ -648,12 +648,12 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
 	message LilycoveCity_ContestLobby_Text_27C8FD
 	waitmessage
 	specialvar VAR_TEMP_D, IsWirelessAdapterConnected
-	multichoice 0, 0, 85, 0
+	multichoice 0, 0, MULTI_LINK_CONTEST_MODE, 0
 	switch VAR_RESULT
 	case 0, LilycoveCity_ContestLobby_EventScript_21A8BB
 	case 1, LilycoveCity_ContestLobby_EventScript_21A8C6
 	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB
@@ -671,10 +671,10 @@ LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6
 LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC
 	message LilycoveCity_ContestLobby_Text_27C119
 	waitmessage
-	multichoice 0, 0, 4, 0
+	multichoice 0, 0, MULTI_CONTEST_TYPE, 0
 	switch VAR_RESULT
 	case 5, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
 	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
 	goto LilycoveCity_ContestLobby_EventScript_21A98C
 	end
@@ -682,13 +682,13 @@ LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC
 LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D
 	message LilycoveCity_ContestLobby_Text_27C0DA
 	waitmessage
-	multichoice 0, 0, 84, 0
+	multichoice 0, 0, MULTI_LINK_CONTEST_INFO, 0
 	switch VAR_RESULT
 	case 0, LilycoveCity_ContestLobby_EventScript_21A955
 	case 1, LilycoveCity_ContestLobby_EventScript_21A963
 	case 2, LilycoveCity_ContestLobby_EventScript_21A971
 	case 3, LilycoveCity_ContestLobby_EventScript_21A819
-	case 127, LilycoveCity_ContestLobby_EventScript_21A819
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A819
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955
@@ -877,12 +877,12 @@ LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
 LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
 	message Text_DecideLinkLeader
 	waitmessage
-	multichoice 16, 6, 81, 0
+	multichoice 16, 6, MULTI_LINK_LEADER, 0
 	switch VAR_RESULT
 	case 0, LilycoveCity_ContestLobby_EventScript_21AC0B
 	case 1, LilycoveCity_ContestLobby_EventScript_21ABE3
 	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
 	end
 
 LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3

data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc

@@ -7,11 +7,11 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
 	setvar VAR_0x8004, 0
 	call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
 	copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
-	special sub_8139B60
+	special ShowDeptStoreElevatorFloorSelect
 	message gUnknown_08272C1D
 	waitmessage
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, sub_81399F4
+	specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice
 	switch VAR_RESULT
 	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
 	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
@@ -21,27 +21,27 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689
-	multichoicedefault 0, 0, 57, 0, 0
+	multichoicedefault 0, 0, MULTI_FLOORS, 0, 0
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695
-	multichoicedefault 0, 0, 57, 1, 0
+	multichoicedefault 0, 0, MULTI_FLOORS, 1, 0
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1
-	multichoicedefault 0, 0, 57, 2, 0
+	multichoicedefault 0, 0, MULTI_FLOORS, 2, 0
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD
-	multichoicedefault 0, 0, 57, 3, 0
+	multichoicedefault 0, 0, MULTI_FLOORS, 3, 0
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9
-	multichoicedefault 0, 0, 57, 4, 0
+	multichoicedefault 0, 0, MULTI_FLOORS, 4, 0
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
 	end
 
@@ -53,76 +53,76 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
 	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740
 	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718
 	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	case 127, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
-	setvar VAR_0x8006, 4
+	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 4
+	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 4
+	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
-	setvar VAR_0x8006, 5
+	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 5
+	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 5
+	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
-	setvar VAR_0x8006, 6
+	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 6
+	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 6
+	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
-	setvar VAR_0x8006, 7
+	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 7
+	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 7
+	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
-	setvar VAR_0x8006, 8
+	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 8
+	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
 	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 8
+	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
-	special sub_8139C10
+	special CloseDeptStoreElevatorWindow
 	release
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
-	special sub_8139C10
+	special CloseDeptStoreElevatorWindow
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	waitse
-	special ShakeScreenInElevator
+	special MoveElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
-	special SetDepartmentStoreFloorVar
+	special SetDeptStoreFloor
 	return
 

data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc

@@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6
-	multichoice 16, 0, 42, 0
+	multichoice 16, 0, MULTI_VENDING_MACHINE, 0
 	copyvar VAR_TEMP_1, VAR_RESULT
 	switch VAR_TEMP_1
 	case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4
@@ -87,42 +87,42 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4
-	setvar VAR_TEMP_0, 26
+	setvar VAR_TEMP_0, ITEM_FRESH_WATER
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF
-	setvar VAR_TEMP_0, 27
+	setvar VAR_TEMP_0, ITEM_SODA_POP
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA
-	setvar VAR_TEMP_0, 28
+	setvar VAR_TEMP_0, ITEM_LEMONADE
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305
-	checkmoney 0xc8, 0
+	checkmoney 200, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C
-	checkmoney 0x12c, 0
+	checkmoney 300, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313
-	checkmoney 0x15e, 0
+	checkmoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A
-	takemoney 0xc8, 0
+	takemoney 200, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321
-	takemoney 0x12c, 0
+	takemoney 300, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328
-	takemoney 0x15e, 0
+	takemoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
@@ -149,7 +149,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
-	bufferstdstring 2, 14
+	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	random 64
 	compare VAR_RESULT, 0
@@ -161,7 +161,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
-	bufferstdstring 2, 14
+	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	random 64
 	compare VAR_RESULT, 0
@@ -173,7 +173,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
-	bufferstdstring 2, 14
+	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
 	end

data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

@@ -10,7 +10,7 @@ LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80
 
 LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
 	setobjectxy 7, 16, 2
-	turnobject 7, 2
+	turnobject 7, DIR_NORTH
 	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6

data/maps/LilycoveCity_Harbor/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_Harbor_EventScript_21E00F",
+      "script": "LilycoveCity_Harbor_EventScript_FerryAttendant",
       "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_Harbor_EventScript_21E637",
+      "script": "LilycoveCity_Harbor_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER"
+      "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER"
     }
   ],
   "warp_events": [

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -6,106 +6,107 @@ LilycoveCity_Harbor_OnTransition: @ 821E006
 	setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
 	end
 
-LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F
+LilycoveCity_Harbor_EventScript_FerryAttendant:: @ 821E00F
 	lock
 	faceplayer
-	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E54D
-	call LilycoveCity_Harbor_EventScript_21E194
-	call LilycoveCity_Harbor_EventScript_21E1C6
-	call LilycoveCity_Harbor_EventScript_21E1F8
-	call LilycoveCity_Harbor_EventScript_21E22A
-	call LilycoveCity_Harbor_EventScript_21E25C
-	call LilycoveCity_Harbor_EventScript_21E2A6
+	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_FerryUnavailable
+	call LilycoveCity_Harbor_EventScript_GetEonTicketState
+	call LilycoveCity_Harbor_EventScript_GetAuroraTicketState
+	call LilycoveCity_Harbor_EventScript_GetOldSeaMapState
+	call LilycoveCity_Harbor_EventScript_GetMysticTicketState
+	call LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket
+	call LilycoveCity_Harbor_EventScript_GetHasTicketsState
 	compare VAR_TEMP_C, 2
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E350
+	goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime
 	compare VAR_TEMP_B, 1
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E2F0
+	goto_if_eq LilycoveCity_Harbor_EventScript_EonTicketFirstTime
 	compare VAR_TEMP_B, 2
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E320
+	goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime
 	compare VAR_TEMP_B, 4
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E350
-	compare VAR_TEMP_B, 8
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E41D
+	goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime
+	compare VAR_TEMP_B, 8 
+	goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime
 	compare VAR_TEMP_B, 0
-	goto_if_ne LilycoveCity_Harbor_EventScript_21E44D
-	goto LilycoveCity_Harbor_EventScript_21E080
+	goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime
+	goto LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets
 	end
 
-LilycoveCity_Harbor_EventScript_21E080:: @ 821E080
+@ First goto_if_eq is unnecessary; identical scripts
+LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets:: @ 821E080
 	compare VAR_TEMP_A, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E557
-	msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT
-	message LilycoveCity_Harbor_Text_21E7ED
+	goto_if_eq LilycoveCity_Harbor_EventScript_NoEventTickets
+	msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
+	message LilycoveCity_Harbor_Text_FlashTicketWhereTo
 	waitmessage
-	goto LilycoveCity_Harbor_EventScript_21E09F
+	goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect
 	end
 
-LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F
+LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect:: @ 821E09F
 	setvar VAR_0x8004, 0
-	special sub_80E2548
+	special ScriptMenu_CreateLilycoveSSTidalMultichoice
 	waitstate
-	special sub_80E2878
+	special GetLilycoveSSTidalSelection
 	switch VAR_RESULT
-	case 0, LilycoveCity_Harbor_EventScript_21E149
-	case 1, LilycoveCity_Harbor_EventScript_21E171
-	case 2, LilycoveCity_Harbor_EventScript_21E109
-	case 3, LilycoveCity_Harbor_EventScript_21E119
-	case 4, LilycoveCity_Harbor_EventScript_21E129
-	case 5, LilycoveCity_Harbor_EventScript_21E139
-	case 6, LilycoveCity_Harbor_EventScript_21E626
-	case 127, LilycoveCity_Harbor_EventScript_21E626
+	case 0, LilycoveCity_Harbor_EventScript_GoToSlateport
+	case 1, LilycoveCity_Harbor_EventScript_GoToBattleFrontier
+	case 2, LilycoveCity_Harbor_EventScript_GoToSouthernIsland
+	case 3, LilycoveCity_Harbor_EventScript_GoToNavelRock
+	case 4, LilycoveCity_Harbor_EventScript_GoToBirthIsland
+	case 5, LilycoveCity_Harbor_EventScript_GoToFarawayIsland
+	case 6, LilycoveCity_Harbor_EventScript_ExitSailSelect
+	case MULTI_B_PRESSED, LilycoveCity_Harbor_EventScript_ExitSailSelect
 	end
 
-LilycoveCity_Harbor_EventScript_21E109:: @ 821E109
-	call LilycoveCity_Harbor_EventScript_21E5CC
+LilycoveCity_Harbor_EventScript_GoToSouthernIsland:: @ 821E109
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E119:: @ 821E119
-	call LilycoveCity_Harbor_EventScript_21E5CC
+LilycoveCity_Harbor_EventScript_GoToNavelRock:: @ 821E119
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E129:: @ 821E129
-	call LilycoveCity_Harbor_EventScript_21E5CC
+LilycoveCity_Harbor_EventScript_GoToBirthIsland:: @ 821E129
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E139:: @ 821E139
-	call LilycoveCity_Harbor_EventScript_21E5CC
+LilycoveCity_Harbor_EventScript_GoToFarawayIsland:: @ 821E139
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E149:: @ 821E149
-	msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO
+LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
+	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0
+	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	setvar VAR_PORTHOLE_STATE, 5
-	call LilycoveCity_Harbor_EventScript_21E5CC
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E171:: @ 821E171
-	msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO
+LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171
+	msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0
-	call LilycoveCity_Harbor_EventScript_21E5CC
+	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
+LilycoveCity_Harbor_EventScript_GetEonTicketState:: @ 821E194
 	setvar VAR_TEMP_E, 0
 	goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn
 	checkitem ITEM_EON_TICKET, 1
@@ -116,7 +117,7 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
 	setvar VAR_TEMP_E, 2
 	return
 
-LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
+LilycoveCity_Harbor_EventScript_GetAuroraTicketState:: @ 821E1C6
 	setvar VAR_TEMP_D, 0
 	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_AURORA_TICKET, 1
@@ -127,7 +128,7 @@ LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
 	setvar VAR_TEMP_D, 2
 	return
 
-LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
+LilycoveCity_Harbor_EventScript_GetOldSeaMapState:: @ 821E1F8
 	setvar VAR_TEMP_C, 0
 	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_OLD_SEA_MAP, 1
@@ -138,7 +139,7 @@ LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
 	setvar VAR_TEMP_C, 2
 	return
 
-LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
+LilycoveCity_Harbor_EventScript_GetMysticTicketState:: @ 821E22A
 	setvar VAR_TEMP_9, 0
 	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn
 	checkitem ITEM_MYSTIC_TICKET, 1
@@ -149,102 +150,102 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
 	setvar VAR_TEMP_9, 2
 	return
 
-LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C
+LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket:: @ 821E25C
 	setvar VAR_TEMP_B, 0
 	compare VAR_TEMP_E, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E28E
+	call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket
 	compare VAR_TEMP_D, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E294
+	call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingAuroraTicket
 	compare VAR_TEMP_C, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E29A
+	call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingOldSeaMap
 	compare VAR_TEMP_9, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E2A0
+	call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket
 	return
 
-LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket:: @ 821E28E
 	addvar VAR_TEMP_B, 1
 	return
 
-LilycoveCity_Harbor_EventScript_21E294:: @ 821E294
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingAuroraTicket:: @ 821E294
 	addvar VAR_TEMP_B, 2
 	return
 
-LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingOldSeaMap:: @ 821E29A
 	addvar VAR_TEMP_B, 4
 	return
 
-LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket:: @ 821E2A0
 	addvar VAR_TEMP_B, 8
 	return
 
-LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6
+LilycoveCity_Harbor_EventScript_GetHasTicketsState:: @ 821E2A6
 	setvar VAR_TEMP_A, 0
 	compare VAR_TEMP_E, 1
-	call_if_eq LilycoveCity_Harbor_EventScript_21E2D8
+	call_if_eq LilycoveCity_Harbor_EventScript_SetHasEonTicket
 	compare VAR_TEMP_D, 1
-	call_if_eq LilycoveCity_Harbor_EventScript_21E2DE
+	call_if_eq LilycoveCity_Harbor_EventScript_SetHasAuroraTicket
 	compare VAR_TEMP_C, 1
-	call_if_eq LilycoveCity_Harbor_EventScript_21E2E4
+	call_if_eq LilycoveCity_Harbor_EventScript_SetHasOldSeaMap
 	compare VAR_TEMP_9, 1
-	call_if_eq LilycoveCity_Harbor_EventScript_21E2EA
+	call_if_eq LilycoveCity_Harbor_EventScript_SetHasMysticTicket
 	return
 
-LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8
+LilycoveCity_Harbor_EventScript_SetHasEonTicket:: @ 821E2D8
 	addvar VAR_TEMP_A, 1
 	return
 
-LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE
+LilycoveCity_Harbor_EventScript_SetHasAuroraTicket:: @ 821E2DE
 	addvar VAR_TEMP_A, 2
 	return
 
-LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4
+LilycoveCity_Harbor_EventScript_SetHasOldSeaMap:: @ 821E2E4
 	addvar VAR_TEMP_A, 4
 	return
 
-LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA
+LilycoveCity_Harbor_EventScript_SetHasMysticTicket:: @ 821E2EA
 	addvar VAR_TEMP_A, 8
 	return
 
-LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0
+LilycoveCity_Harbor_EventScript_EonTicketFirstTime:: @ 821E2F0
 	setflag FLAG_HAS_EON_TICKET
-	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2A68FC, MSGBOX_DEFAULT
-	goto LilycoveCity_Harbor_EventScript_21E30F
+	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
+	msgbox EventTicket_Text_ShowEonTicket, MSGBOX_DEFAULT
+	goto LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime
 	end
 
-LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F
+LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime:: @ 821E30F
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
+	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E320:: @ 821E320
+LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime:: @ 821E320
 	setflag FLAG_HAS_AURORA_TICKET
-	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT
-	goto LilycoveCity_Harbor_EventScript_21E33F
+	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
+	msgbox EventTicket_Text_OddTicketGetOnBoard, MSGBOX_DEFAULT
+	goto LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime
 	end
 
-LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F
+LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime:: @ 821E33F
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
+	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
+LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350
 	setflag FLAG_HAS_OLD_SEA_MAP
-	msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_ShowOldSeaMap, MSGBOX_DEFAULT
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT
+	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
+	msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
@@ -253,80 +254,80 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
 	waitmovement 0
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	compare VAR_FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E656
-	compare VAR_FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_21E661
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth
+	compare VAR_FACING, DIR_EAST
+	call_if_eq LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast
 	addobject 5
-	compare VAR_FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E675
-	compare VAR_FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_21E680
-	msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT
-	compare VAR_FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E68B
-	compare VAR_FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_21E696
-	msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth
+	compare VAR_FACING, DIR_EAST
+	call_if_eq LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast
+	msgbox EventTicket_Text_BrineyHoldOnASecond, MSGBOX_DEFAULT
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth
+	compare VAR_FACING, DIR_EAST
+	call_if_eq LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast
+	msgbox EventTicket_Text_BrineyLetsSail, MSGBOX_DEFAULT
 	closemessage
-	compare VAR_FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E6A1
-	compare VAR_FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_21E6BA
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth
+	compare VAR_FACING, DIR_EAST
+	call_if_eq LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast
 	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_2721E2
+	call Common_EventScript_FerryDepart
 	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C
+LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime:: @ 821E40C
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
+	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D
+LilycoveCity_Harbor_EventScript_MysticTicketFirstTime:: @ 821E41D
 	setflag FLAG_HAS_MYSTIC_TICKET
-	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT
-	goto LilycoveCity_Harbor_EventScript_21E43C
+	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
+	msgbox EventTicket_Text_OddTicketGetOnBoard, MSGBOX_DEFAULT
+	goto LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime
 	end
 
-LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C
+LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime:: @ 821E43C
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
+	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D
-	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
+LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D
+	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	message LilycoveCity_Harbor_Text_2C6BD4
+	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
+	message EventTicket_Text_OddTicketsWhereTo
 	waitmessage
 	setvar VAR_0x8004, 1
-	special sub_80E2548
+	special ScriptMenu_CreateLilycoveSSTidalMultichoice
 	waitstate
-	special sub_80E2878
+	special GetLilycoveSSTidalSelection
 	switch VAR_RESULT
-	case 2, LilycoveCity_Harbor_EventScript_21E30F
-	case 3, LilycoveCity_Harbor_EventScript_21E43C
-	case 4, LilycoveCity_Harbor_EventScript_21E33F
-	case 5, LilycoveCity_Harbor_EventScript_21E40C
-	case 6, LilycoveCity_Harbor_EventScript_21E4B6
-	case 127, LilycoveCity_Harbor_EventScript_21E4B6
+	case 2, LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime
+	case 3, LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime
+	case 4, LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime
+	case 5, LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime
+	case 6, LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect
+	case MULTI_B_PRESSED, LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
-	msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT
+LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
+	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
@@ -337,11 +338,11 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
 	waitmovement 0
 	showobjectat 1, MAP_LILYCOVE_CITY_HARBOR
 	delay 30
-	msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE
+LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
@@ -353,194 +354,198 @@ LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
+LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
 	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	removeobject 4
-	compare VAR_FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E61B
-	compare VAR_FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_21E610
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth
+	compare VAR_FACING, DIR_EAST
+	call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
 	delay 30
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_2721E2
+	call Common_EventScript_FerryDepart
 	return
 
-LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D
-	msgbox LilycoveCity_Harbor_Text_21E6F1, MSGBOX_DEFAULT
+LilycoveCity_Harbor_EventScript_FerryUnavailable:: @ 821E54D
+	msgbox LilycoveCity_Harbor_Text_FerryUnavailable, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E557:: @ 821E557
-	msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT
-	message LilycoveCity_Harbor_Text_21E7ED
+LilycoveCity_Harbor_EventScript_NoEventTickets:: @ 821E557
+	msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
+	message LilycoveCity_Harbor_Text_FlashTicketWhereTo
 	waitmessage
-	goto LilycoveCity_Harbor_EventScript_21E09F
+	goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect
 	end
 
-LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B
-	msgbox LilycoveCity_Harbor_Text_21E792, MSGBOX_DEFAULT
+@ Unused
+LilycoveCity_Harbor_EventScript_NoTicket:: @ 821E56B
+	msgbox LilycoveCity_Harbor_Text_NoTicket, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
-	msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO
+@ Unused
+LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
+	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0
+	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	setvar VAR_PORTHOLE_STATE, 5
-	call LilycoveCity_Harbor_EventScript_21E5CC
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D
-	msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO
+@ Unused
+LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused:: @ 821E59D
+	msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0
-	call LilycoveCity_Harbor_EventScript_21E5CC
+	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
+	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0
-	message LilycoveCity_Harbor_Text_21E8CC
+LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0
+	message LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo
 	waitmessage
-	goto LilycoveCity_Harbor_EventScript_21E09F
+	goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect
 	end
 
-LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
-	msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT
+LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
+	msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
-	compare VAR_FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_21E61B
-	compare VAR_FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_21E610
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth
+	compare VAR_FACING, DIR_EAST
+	call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
 	delay 30
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_2721E2
+	call Common_EventScript_FerryDepart
 	return
 
-LilycoveCity_Harbor_EventScript_21E610:: @ 821E610
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E630
+LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 821E610
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E633
+LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 821E61B
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E626:: @ 821E626
-	msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT
+LilycoveCity_Harbor_EventScript_ExitSailSelect:: @ 821E626
+	msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_Movement_21E630: @ 821E630
+LilycoveCity_Harbor_Movement_PlayerBoardFerryEast: @ 821E630
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_Harbor_Movement_21E633: @ 821E633
+LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633
 	walk_up
 	step_end
 
+@ Unused
 LilycoveCity_Harbor_Movement_21E635: @ 821E635
 	walk_up
 	step_end
 
-LilycoveCity_Harbor_EventScript_21E637:: @ 821E637
+LilycoveCity_Harbor_EventScript_Sailor:: @ 821E637
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E64C
-	msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_SailorFerryAvailable
+	msgbox LilycoveCity_Harbor_Text_SailorFerryUnavailable, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C
-	msgbox LilycoveCity_Harbor_Text_21E976, MSGBOX_DEFAULT
+LilycoveCity_Harbor_EventScript_SailorFerryAvailable:: @ 821E64C
+	msgbox LilycoveCity_Harbor_Text_SailorFerryAvailable, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_21E656:: @ 821E656
-	applymovement 4, LilycoveCity_Harbor_Movement_21E66C
+LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth:: @ 821E656
+	applymovement 4, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E661:: @ 821E661
-	applymovement 4, LilycoveCity_Harbor_Movement_21E671
+LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast:: @ 821E661
+	applymovement 4, LilycoveCity_Harbor_Movement_SailorOutOfWayEast
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_Movement_21E66C: @ 821E66C
+LilycoveCity_Harbor_Movement_SailorOutOfWayNorth: @ 821E66C
 	walk_in_place_fastest_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_Harbor_Movement_21E671: @ 821E671
+LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_Harbor_EventScript_21E675:: @ 821E675
+LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675
 	applymovement 5, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E680:: @ 821E680
+LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680
 	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B
+LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B
 	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E696:: @ 821E696
+LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696
 	applymovement 5, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1
-	applymovement 5, LilycoveCity_Harbor_Movement_21E6D3
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6D7
-	applymovement 4, LilycoveCity_Harbor_Movement_21E6DC
+LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: @ 821E6A1
+	applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth
+	applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA
-	applymovement 5, LilycoveCity_Harbor_Movement_21E6D3
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6E4
-	applymovement 4, LilycoveCity_Harbor_Movement_21E6EA
+LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast:: @ 821E6BA
+	applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast
+	applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3
+LilycoveCity_Harbor_Movement_BrineyBoardFerry: @ 821E6D3
 	walk_in_place_fastest_up
 	delay_8
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7
+LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth: @ 821E6D7
 	delay_16
 	walk_up
 	delay_16
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC
+LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth: @ 821E6DC
 	delay_16
 	delay_16
 	delay_16
@@ -550,7 +555,7 @@ LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4
+LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast: @ 821E6E4
 	delay_16
 	walk_right
 	walk_in_place_fastest_up
@@ -558,7 +563,7 @@ LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA
+LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast: @ 821E6EA
 	delay_16
 	delay_16
 	delay_16
@@ -567,51 +572,50 @@ LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1
+LilycoveCity_Harbor_Text_FerryUnavailable: @ 821E6F1
 	.string "I beg your pardon?\n"
 	.string "You're looking for a ship?\p"
 	.string "I'm sorry, the ferry service isn't\n"
 	.string "available at present…$"
 
-LilycoveCity_Harbor_Text_21E758: @ 821E758
+LilycoveCity_Harbor_Text_MayISeeYourTicket: @ 821E758
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-
-LilycoveCity_Harbor_Text_21E792: @ 821E792
+LilycoveCity_Harbor_Text_NoTicket: @ 821E792
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED
+LilycoveCity_Harbor_Text_FlashTicketWhereTo: @ 821E7ED
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-LilycoveCity_Harbor_Text_21E842: @ 821E842
+LilycoveCity_Harbor_Text_SailAnotherTime: @ 821E842
 	.string "Please sail with us another time!$"
 
-LilycoveCity_Harbor_Text_21E864: @ 821E864
+LilycoveCity_Harbor_Text_SlateportItIs: @ 821E864
 	.string "SLATEPORT CITY it is, then!$"
 
-LilycoveCity_Harbor_Text_21E880: @ 821E880
+LilycoveCity_Harbor_Text_BattleFrontierItIs: @ 821E880
 	.string "BATTLE FRONTIER it is, then!$"
 
-LilycoveCity_Harbor_Text_21E89D: @ 821E89D
+LilycoveCity_Harbor_Text_PleaseBoard: @ 821E89D
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC
+LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo: @ 821E8CC
 	.string "Then, where would you like to go?$"
 
-LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE
+LilycoveCity_Harbor_Text_SailorFerryUnavailable: @ 821E8EE
 	.string "Until they finish making the ferry,\n"
 	.string "we sailors have nothing to do…\p"
 	.string "I wish they'd get a move on, the folks\n"
 	.string "at the SHIPYARD in SLATEPORT.$"
 
-LilycoveCity_Harbor_Text_21E976: @ 821E976
+LilycoveCity_Harbor_Text_SailorFerryAvailable: @ 821E976
 	.string "The ferry S.S. TIDAL is finally in\n"
 	.string "operation.\p"
 	.string "The folks at the SHIPYARD in SLATEPORT\n"

data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc

@@ -10,7 +10,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
 	applymovement 2, Common_Movement_FacePlayer
 	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
 	waitmessage
-	multichoice 20, 8, 16, 1
+	multichoice 20, 8, MULTI_VIEWED_PAINTINGS, 1
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5
 	compare VAR_RESULT, 1

data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc

@@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
 LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
 	applymovement 1, Common_Movement_FacePlayer
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT
-	givedecoration_std 44
+	givedecoration_std DECOR_GLASS_ORNAMENT
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
 	setflag FLAG_RECEIVED_GLASS_ORNAMENT

data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc

@@ -558,13 +558,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
 	special BufferStreakTrainerText
 	message LilycoveCity_PokemonTrainerFanClub_Text_281C95
 	waitmessage
-	setvar VAR_0x8004, 2
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
+	special ShowScrollableMultichoice
 	waitstate
 	setvar VAR_0x8004, 8
 	switch VAR_RESULT
 	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
-	case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
+	case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
 	copyvar VAR_0x8006, VAR_0x800A

data/maps/LittlerootTown/scripts.inc

@@ -208,7 +208,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC
 	addobject 8
 	addobject 7
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_EventScript_1E8004
 	goto LittlerootTown_EventScript_1E8013
 	end

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A
 	return
 

data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc

@@ -22,7 +22,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
@@ -35,7 +35,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464
 	return
 
@@ -49,7 +49,7 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq EventScript_275D0C
 	end
 

data/maps/LittlerootTown_MaysHouse_1F/scripts.inc

@@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
 
 LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA
 	return
 

data/maps/LittlerootTown_MaysHouse_2F/scripts.inc

@@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
 
 LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
@@ -36,7 +36,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
 
 LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
 	return
 
@@ -50,7 +50,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
 
 LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq EventScript_275D0C
 	end
 

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -48,18 +48,18 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
 	.2byte 0
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	addobject 2
 	addobject 3
-	turnobject 3, 2
+	turnobject 3, DIR_NORTH
 	setobjectxy 3, 5, 5
-	turnobject 2, 1
+	turnobject 2, DIR_SOUTH
 	setobjectxy 2, 6, 4
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
 	setobjectxy 1, 10, 10
 	end
 
@@ -72,15 +72,15 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
 	addobject 5
 	addobject 6
 	addobject 3
-	turnobject 4, 1
+	turnobject 4, DIR_SOUTH
 	setobjectxy 4, 8, 4
-	turnobject 5, 1
+	turnobject 5, DIR_SOUTH
 	setobjectxy 5, 9, 4
-	turnobject 6, 1
+	turnobject 6, DIR_SOUTH
 	setobjectxy 6, 10, 4
-	turnobject 2, 1
+	turnobject 2, DIR_SOUTH
 	setobjectxy 2, 6, 4
-	turnobject 3, 4
+	turnobject 3, DIR_EAST
 	setobjectxy 3, 5, 5
 	end
 
@@ -335,7 +335,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
 	bufferspeciesname 0, SPECIES_CYNDAQUIL
 	setvar VAR_TEMP_1, SPECIES_CYNDAQUIL
-	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
 	compare VAR_RESULT, 1
@@ -380,7 +380,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
 	bufferspeciesname 0, SPECIES_TOTODILE
 	setvar VAR_TEMP_1, SPECIES_TOTODILE
-	givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_TOTODILE, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
 	compare VAR_RESULT, 1
@@ -425,7 +425,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
 	bufferspeciesname 0, SPECIES_CHIKORITA
 	setvar VAR_TEMP_1, SPECIES_CHIKORITA
-	givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_CHIKORITA, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
 	compare VAR_RESULT, 1

data/maps/MauvilleCity_BikeShop/scripts.inc

@@ -25,7 +25,7 @@ MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7
 MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16
 	message MauvilleCity_BikeShop_Text_20EF32
 	waitmessage
-	multichoice 21, 8, 12, 1
+	multichoice 21, 8, MULTI_BIKE, 1
 	switch VAR_RESULT
 	case 0, MauvilleCity_BikeShop_EventScript_20EC53
 	case 1, MauvilleCity_BikeShop_EventScript_20EC6D
@@ -112,13 +112,13 @@ MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A
 	end
 
 MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46
-	multichoice 0, 0, 43, 0
+	multichoice 0, 0, MULTI_MACH_BIKE_INFO, 0
 	switch VAR_RESULT
 	case 0, MauvilleCity_BikeShop_EventScript_20ED88
 	case 1, MauvilleCity_BikeShop_EventScript_20ED94
 	case 2, MauvilleCity_BikeShop_EventScript_20EDA0
 	case 3, MauvilleCity_BikeShop_EventScript_20EDAC
-	case 127, MauvilleCity_BikeShop_EventScript_20EDAC
+	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EDAC
 	end
 
 MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88
@@ -150,13 +150,13 @@ MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE
 	end
 
 MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA
-	multichoice 0, 0, 44, 0
+	multichoice 0, 0, MULTI_ACRO_BIKE_INFO, 0
 	switch VAR_RESULT
 	case 0, MauvilleCity_BikeShop_EventScript_20EDFC
 	case 1, MauvilleCity_BikeShop_EventScript_20EE08
 	case 2, MauvilleCity_BikeShop_EventScript_20EE14
 	case 3, MauvilleCity_BikeShop_EventScript_20EE20
-	case 127, MauvilleCity_BikeShop_EventScript_20EE20
+	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EE20
 	end
 
 MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -15,7 +15,7 @@ MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9
 	goto MauvilleCity_GameCorner_EventScript_20FBE5
 
 MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5
-	multichoicedefault 15, 0, 49, 0, 0
+	multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, 0
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_20FC33
 	case 1, MauvilleCity_GameCorner_EventScript_20FC75
@@ -23,7 +23,7 @@ MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5
 	end
 
 MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C
-	multichoicedefault 15, 0, 49, 1, 0
+	multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, 0
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_20FC33
 	case 1, MauvilleCity_GameCorner_EventScript_20FC75
@@ -34,11 +34,11 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9950
 	goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1
-	checkmoney 0x3e8, 0
+	checkmoney 1000, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
 	givecoins 50
-	takemoney 0x3e8, 0
+	takemoney 1000, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
@@ -54,11 +54,11 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9500
 	goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1
-	checkmoney 0x2710, 0
+	checkmoney 10000, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
 	givecoins 500
-	takemoney 0x2710, 0
+	takemoney 10000, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
@@ -125,7 +125,7 @@ MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20
 	goto MauvilleCity_GameCorner_EventScript_20FD2B
 
 MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B
-	multichoice 12, 0, 48, 0
+	multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, 0
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_20FD67
 	case 1, MauvilleCity_GameCorner_EventScript_20FD75
@@ -136,17 +136,17 @@ MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B
 
 MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67
 	setvar VAR_TEMP_1, 1
-	bufferdecorationname 0, 88
+	bufferdecorationname 0, DECOR_TREECKO_DOLL
 	goto MauvilleCity_GameCorner_EventScript_20FD91
 
 MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75
 	setvar VAR_TEMP_1, 2
-	bufferdecorationname 0, 89
+	bufferdecorationname 0, DECOR_TORCHIC_DOLL
 	goto MauvilleCity_GameCorner_EventScript_20FD91
 
 MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83
 	setvar VAR_TEMP_1, 3
-	bufferdecorationname 0, 90
+	bufferdecorationname 0, DECOR_MUDKIP_DOLL
 	goto MauvilleCity_GameCorner_EventScript_20FD91
 
 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91
@@ -163,12 +163,12 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
-	bufferdecorationname 1, 88
-	checkdecorspace 88
+	bufferdecorationname 1, DECOR_TREECKO_DOLL
+	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
 	takecoins 1000
-	givedecoration 88
+	givedecoration DECOR_TREECKO_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
@@ -179,12 +179,12 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
-	bufferdecorationname 1, 89
-	checkdecorspace 89
+	bufferdecorationname 1, DECOR_TORCHIC_DOLL
+	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
 	takecoins 1000
-	givedecoration 89
+	givedecoration DECOR_TORCHIC_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
@@ -195,12 +195,12 @@ MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
-	bufferdecorationname 1, 90
-	checkdecorspace 90
+	bufferdecorationname 1, DECOR_MUDKIP_DOLL
+	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
 	takecoins 1000
-	givedecoration 90
+	givedecoration DECOR_MUDKIP_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
@@ -246,7 +246,7 @@ MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE
 	goto MauvilleCity_GameCorner_EventScript_20FED9
 
 MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9
-	multichoice 12, 0, 55, 0
+	multichoice 12, 0, MULTI_GAME_CORNER_TMS, 0
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_20FF2B
 	case 1, MauvilleCity_GameCorner_EventScript_20FF3E
@@ -288,7 +288,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77
 	goto MauvilleCity_GameCorner_EventScript_20FF8A
 
 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A
-	special sub_81398C0
+	special BufferTMHMMoveName
 	msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_210118
@@ -413,34 +413,34 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
 	end
 
 MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C
-	bufferdecorationname 1, 88
-	checkdecorspace 88
+	bufferdecorationname 1, DECOR_TREECKO_DOLL
+	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
-	givedecoration_std 88
+	givedecoration_std DECOR_TREECKO_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
 MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6
-	bufferdecorationname 1, 89
-	checkdecorspace 89
+	bufferdecorationname 1, DECOR_TORCHIC_DOLL
+	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
-	givedecoration_std 89
+	givedecoration_std DECOR_TORCHIC_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
 MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
-	bufferdecorationname 1, 90
-	checkdecorspace 90
+	bufferdecorationname 1, DECOR_MUDKIP_DOLL
+	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
-	givedecoration_std 90
+	givedecoration_std DECOR_MUDKIP_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -300,11 +300,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	removeobject 8
 	removeobject 9
 	setobjectxy 3, 5, 6
-	turnobject 3, 1
+	turnobject 3, DIR_SOUTH
 	setobjectxy 2, 11, 8
-	turnobject 2, 2
+	turnobject 2, DIR_NORTH
 	setobjectxy 1, 6, 2
-	turnobject 1, 2
+	turnobject 1, DIR_NORTH
 	call MossdeepCity_SpaceCenter_2F_EventScript_224131
 	fadescreen 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT
@@ -331,11 +331,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
-	turnobject 4, 2
+	turnobject 4, DIR_NORTH
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
-	turnobject 4, 4
+	turnobject 4, DIR_EAST
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -85,7 +85,7 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
 
 MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
 	setvar VAR_TEMP_1, SPECIES_BELDUM
-	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_BELDUM, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_222895
 	compare VAR_RESULT, 1

data/maps/MtChimney/scripts.inc

@@ -104,7 +104,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
 	msgbox MtChimney_Text_22FE04, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_22EF69
-	checkmoney 0xc8, 0
+	checkmoney 200, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_22EF76
 	msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT
@@ -129,7 +129,7 @@ MtChimney_EventScript_22EF51:: @ 822EF51
 	end
 
 MtChimney_EventScript_22EF5E:: @ 822EF5E
-	takemoney 0xc8, 0
+	takemoney 200, 0
 	updatemoneybox 0, 0
 	return
 

data/maps/NavelRock_Harbor/scripts.inc

@@ -4,10 +4,10 @@ NavelRock_Harbor_MapScripts:: @ 82690BC
 NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
 	lock
 	faceplayer
-	msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO
+	msgbox NavelRock_Harbor_Text_SailorReturn, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq NavelRock_Harbor_EventScript_269102
-	msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
@@ -21,7 +21,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
 	end
 
 NavelRock_Harbor_EventScript_269102:: @ 8269102
-	msgbox NavelRock_Harbor_Text_2A6A82, MSGBOX_DEFAULT
+	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 

data/maps/PetalburgCity_Gym/scripts.inc

@@ -78,7 +78,7 @@ PetalburgCity_Gym_MapScript2_20498B: @ 820498B
 	.2byte 0
 
 PetalburgCity_Gym_EventScript_204995:: @ 8204995
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 PetalburgCity_Gym_MapScript2_20499A: @ 820499A
@@ -418,7 +418,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 	setflag FLAG_DEFEATED_PETALBURG_GYM
 	setvar VAR_PETALBURG_GYM_STATE, 7
 	setflag FLAG_BADGE05_GET
-	special sub_813B9A0
+	special ResetHealLocationFromDewford
 	call PetalburgCity_Gym_EventScript_2721F8
 	setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
 	clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON

data/maps/PetalburgCity_WallysHouse/scripts.inc

@@ -8,8 +8,8 @@ PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234
 	.2byte 0
 
 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
-	turnobject EVENT_OBJ_ID_PLAYER, 4
-	turnobject 1, 3
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST
+	turnobject 1, DIR_WEST
 	end
 
 PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247

data/maps/Route104_MrBrineysHouse/scripts.inc

@@ -41,11 +41,11 @@ Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A
 Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE
 	message Route104_MrBrineysHouse_Text_22A268
 	waitmessage
-	multichoicedefault 20, 8, 14, 1, 0
+	multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
 	switch VAR_RESULT
 	case 0, Route104_MrBrineysHouse_EventScript_229E27
 	case 1, Route104_MrBrineysHouse_EventScript_229E1D
-	case 127, Route104_MrBrineysHouse_EventScript_229E1D
+	case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_229E1D
 	end
 
 Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1

data/maps/Route109/scripts.inc

@@ -287,11 +287,11 @@ Route109_EventScript_1EE921:: @ 81EE921
 Route109_EventScript_1EE93F:: @ 81EE93F
 	message Route109_Text_1EEE17
 	waitmessage
-	multichoicedefault 21, 8, 14, 1, 0
+	multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
 	switch VAR_RESULT
 	case 0, Route109_EventScript_1EE972
 	case 1, Route109_EventScript_1EE98B
-	case 127, Route109_EventScript_1EE98B
+	case MULTI_B_PRESSED, Route109_EventScript_1EE98B
 	end
 
 Route109_EventScript_1EE972:: @ 81EE972

data/maps/Route109_SeashoreHouse/scripts.inc

@@ -49,14 +49,14 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460
 	end
 
 Route109_SeashoreHouse_EventScript_269484:: @ 8269484
-	checkmoney 0x12c, 0
+	checkmoney 300, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_2694C8
 	checkitemspace ITEM_SODA_POP, 1
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_2694D5
 	msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT
-	takemoney 0x12c, 0
+	takemoney 300, 0
 	updatemoneybox 0, 0
 	giveitem_std ITEM_SODA_POP
 	hidemoneybox

data/maps/Route110_TrickHouseEnd/scripts.inc

@@ -23,7 +23,7 @@ Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
 Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
 	end
 
 Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5
@@ -176,17 +176,17 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
 	end
 
 Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
-	multichoice 0, 0, 88, 1
+	multichoice 0, 0, MULTI_TENT, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHouseEnd_EventScript_26AFBF
 	goto Route110_TrickHouseEnd_EventScript_26AFC7
 
 Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF
-	givedecoration_std 31
+	givedecoration_std DECOR_RED_TENT
 	return
 
 Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
-	givedecoration_std 32
+	givedecoration_std DECOR_BLUE_TENT
 	return
 
 Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
@@ -233,7 +233,7 @@ Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
 
 Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
 	lockall
-	turnobject 1, 3
+	turnobject 1, DIR_WEST
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -248,7 +248,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
 	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089
 	waitmovement 0
 	delay 4
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
 	releaseall
 	end
 

data/maps/Route110_TrickHouseEntrance/scripts.inc

@@ -132,8 +132,8 @@ Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	turnobject 1, 4
-	turnobject EVENT_OBJ_ID_PLAYER, 3
+	turnobject 1, DIR_EAST
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST
 	end
 
 Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
@@ -189,13 +189,13 @@ Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC
 Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0
 	addobject 1
 	setobjectxy 1, 5, 2
-	turnobject 1, 2
+	turnobject 1, DIR_NORTH
 	end
 
 Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
 	addobject 1
 	setobjectxy 1, 5, 2
-	turnobject 1, 1
+	turnobject 1, DIR_SOUTH
 	end
 
 Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
@@ -451,17 +451,17 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
-	multichoice 0, 0, 88, 1
+	multichoice 0, 0, MULTI_TENT, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHouseEntrance_EventScript_26A08A
 	goto Route110_TrickHouseEntrance_EventScript_26A092
 
 Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
-	givedecoration_std 31
+	givedecoration_std DECOR_RED_TENT
 	return
 
 Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
-	givedecoration_std 32
+	givedecoration_std DECOR_BLUE_TENT
 	return
 
 Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A

data/maps/Route110_TrickHousePuzzle5/scripts.inc

@@ -327,7 +327,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
 
 Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45
 	msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT
-	multichoice 0, 0, 25, 1
+	multichoice 0, 0, MULTI_MECHADOLL1_Q1, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -335,7 +335,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45
 
 Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68
 	msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT
-	multichoice 0, 0, 26, 1
+	multichoice 0, 0, MULTI_MECHADOLL1_Q2, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -343,7 +343,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68
 
 Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B
 	msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT
-	multichoice 0, 0, 27, 1
+	multichoice 0, 0, MULTI_MECHADOLL1_Q3, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -351,7 +351,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B
 
 Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE
 	msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT
-	multichoice 0, 0, 28, 1
+	multichoice 0, 0, MULTI_MECHADOLL2_Q1, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -359,7 +359,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE
 
 Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1
 	msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT
-	multichoice 0, 0, 29, 1
+	multichoice 0, 0, MULTI_MECHADOLL2_Q2, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -367,7 +367,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1
 
 Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4
 	msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT
-	multichoice 0, 0, 30, 1
+	multichoice 0, 0, MULTI_MECHADOLL2_Q3, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -375,7 +375,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4
 
 Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017
 	msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT
-	multichoice 0, 0, 31, 1
+	multichoice 0, 0, MULTI_MECHADOLL3_Q1, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -383,7 +383,7 @@ Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017
 
 Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A
 	msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT
-	multichoice 0, 0, 32, 1
+	multichoice 0, 0, MULTI_MECHADOLL3_Q2, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -391,7 +391,7 @@ Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A
 
 Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D
 	msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT
-	multichoice 0, 0, 33, 1
+	multichoice 0, 0, MULTI_MECHADOLL3_Q3, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -399,7 +399,7 @@ Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D
 
 Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080
 	msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT
-	multichoice 0, 0, 34, 1
+	multichoice 0, 0, MULTI_MECHADOLL4_Q1, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -407,7 +407,7 @@ Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080
 
 Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3
 	msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT
-	multichoice 0, 0, 35, 1
+	multichoice 0, 0, MULTI_MECHADOLL4_Q2, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -415,7 +415,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3
 
 Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6
 	msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT
-	multichoice 0, 0, 36, 1
+	multichoice 0, 0, MULTI_MECHADOLL4_Q3, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -423,7 +423,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6
 
 Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9
 	msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT
-	multichoice 0, 0, 37, 1
+	multichoice 0, 0, MULTI_MECHADOLL5_Q1, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -431,7 +431,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9
 
 Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C
 	msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT
-	multichoice 0, 0, 38, 1
+	multichoice 0, 0, MULTI_MECHADOLL5_Q2, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152
@@ -439,7 +439,7 @@ Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C
 
 Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F
 	msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT
-	multichoice 0, 0, 39, 1
+	multichoice 0, 0, MULTI_MECHADOLL5_Q3, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
 	goto Route110_TrickHousePuzzle5_EventScript_26D152

data/maps/Route111/scripts.inc

@@ -128,7 +128,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	removeobject 45
 	delay 16
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	delay 16
 	special StartMirageTowerDisintegration
 	waitstate

data/maps/Route113_GlassWorkshop/scripts.inc

@@ -52,8 +52,8 @@ Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D
 
 Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8004, 1
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR
+	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
 	case 0, Route113_GlassWorkshop_EventScript_26EE1E
@@ -64,11 +64,11 @@ Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7
 	case 5, Route113_GlassWorkshop_EventScript_26EF4A
 	case 6, Route113_GlassWorkshop_EventScript_26EF8B
 	case 7, Route113_GlassWorkshop_EventScript_26EFCC
-	case 127, Route113_GlassWorkshop_EventScript_26EFCC
+	case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_26EFCC
 	end
 
 Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
-	setvar VAR_0x8008, 39
+	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 250
 	compare VAR_ASH_GATHER_COUNT, 250
@@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
 	end
 
 Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
-	setvar VAR_0x8008, 40
+	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 500
 	compare VAR_ASH_GATHER_COUNT, 500
@@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
 	end
 
 Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
-	setvar VAR_0x8008, 41
+	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 500
 	compare VAR_ASH_GATHER_COUNT, 500
@@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
 	end
 
 Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
-	setvar VAR_0x8008, 43
+	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 1000
 	compare VAR_ASH_GATHER_COUNT, 1000
@@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
 	end
 
 Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
-	setvar VAR_0x8008, 42
+	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 1000
 	compare VAR_ASH_GATHER_COUNT, 1000
@@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
 
 Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 13
+	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
 	bufferdecorationname 0, VAR_0x8008
 	setvar VAR_0x800A, 6000
 	compare VAR_ASH_GATHER_COUNT, 6000
@@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
 
 Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 6
+	setvar VAR_0x8008, DECOR_PRETTY_DESK
 	bufferdecorationname 0, VAR_0x8008
 	setvar VAR_0x800A, 8000
 	compare VAR_ASH_GATHER_COUNT, 8000
@@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC
 
 Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6
 	setvar VAR_0x800A, 250
-	subvar VAR_0x800A, 16456
+	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 0, VAR_0x800A
 	msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE
-	subvar VAR_0x800A, 16456
+	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 1, VAR_0x800A
 	message Route113_GlassWorkshop_Text_26F543
 	waitmessage
@@ -247,50 +247,50 @@ Route113_GlassWorkshop_EventScript_26F090:: @ 826F090
 
 Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 39
+	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 40
+	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 41
+	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 43
+	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F133:: @ 826F133
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 42
+	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F147:: @ 826F147
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 13
-	bufferdecorationname 0, 13
+	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
+	bufferdecorationname 0, DECOR_PRETTY_CHAIR
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 6
-	bufferdecorationname 0, 6
+	setvar VAR_0x8008, DECOR_PRETTY_DESK
+	bufferdecorationname 0, DECOR_PRETTY_DESK
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 

data/maps/Route114/scripts.inc

@@ -32,7 +32,7 @@ Route114_EventScript_1F2582:: @ 81F2582
 	msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
 	random 5
 	addvar VAR_RESULT, 15
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/Route114_LanettesHouse/scripts.inc

@@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2
 	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF
 	setflag FLAG_SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT
-	givedecoration_std 99
+	givedecoration_std DECOR_LOTAD_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq Route114_LanettesHouse_EventScript_272067
 	setflag FLAG_RECEIVED_DOLL_LANETTE

data/maps/Route117/map.json

@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_291C18",
+      "script": "Route117_EventScript_DaycareMan",
       "flag": "0"
     },
     {

data/maps/Route117_PokemonDayCare/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_PokemonDayCare_EventScript_291D11",
+      "script": "Route117_PokemonDayCare_EventScript_DaycareWoman",
       "flag": "0"
     }
   ],

data/maps/Route119_WeatherInstitute_2F/scripts.inc

@@ -84,7 +84,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
 	msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, SPECIES_CASTFORM
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
 	compare VAR_RESULT, 0
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085
 	compare VAR_RESULT, 1

data/maps/Route120/scripts.inc

@@ -120,27 +120,27 @@ Route120_EventScript_1F5527:: @ 81F5527
 	end
 
 Route120_EventScript_1F55CA:: @ 81F55CA
-	setvar VAR_0x8004, 143
+	setvar VAR_0x8004, ITEM_FIGY_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55D5:: @ 81F55D5
-	setvar VAR_0x8004, 144
+	setvar VAR_0x8004, ITEM_WIKI_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55E0:: @ 81F55E0
-	setvar VAR_0x8004, 145
+	setvar VAR_0x8004, ITEM_MAGO_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55EB:: @ 81F55EB
-	setvar VAR_0x8004, 146
+	setvar VAR_0x8004, ITEM_AGUAV_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55F6:: @ 81F55F6
-	setvar VAR_0x8004, 147
+	setvar VAR_0x8004, ITEM_IAPAPA_BERRY
 	goto Route120_EventScript_1F5601
 	end
 

data/maps/Route121_SafariZoneEntrance/scripts.inc

@@ -61,12 +61,12 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA
 	call Route121_SafariZoneEntrance_EventScript_22BCBF
-	checkmoney 0x1f4, 0
+	checkmoney 500, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8
 	playse SE_REGI
 	msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT
-	takemoney 0x1f4, 0
+	takemoney 500, 0
 	updatemoneybox 0, 0
 	msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4

data/maps/Route123_BerryMastersHouse/scripts.inc

@@ -14,7 +14,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -22,7 +22,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -75,7 +75,7 @@ Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909
 Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
 	msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT
 	random 10
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc

@@ -86,7 +86,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F
-	multichoice 0, 0, 58, 0
+	multichoice 0, 0, MULTI_SHARDS_R, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
@@ -94,7 +94,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5
-	multichoice 0, 0, 59, 0
+	multichoice 0, 0, MULTI_SHARDS_Y, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
@@ -102,7 +102,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB
-	multichoice 0, 0, 60, 0
+	multichoice 0, 0, MULTI_SHARDS_RY, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
@@ -111,7 +111,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C
-	multichoice 0, 0, 61, 0
+	multichoice 0, 0, MULTI_SHARDS_B, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
@@ -119,7 +119,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32
-	multichoice 0, 0, 62, 0
+	multichoice 0, 0, MULTI_SHARDS_RB, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
@@ -128,7 +128,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63
-	multichoice 0, 0, 63, 0
+	multichoice 0, 0, MULTI_SHARDS_YB, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
@@ -137,7 +137,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94
-	multichoice 0, 0, 64, 0
+	multichoice 0, 0, MULTI_SHARDS_RYB, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
@@ -147,7 +147,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0
-	multichoice 0, 0, 65, 0
+	multichoice 0, 0, MULTI_SHARDS_G, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
@@ -155,7 +155,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6
-	multichoice 0, 0, 66, 0
+	multichoice 0, 0, MULTI_SHARDS_RG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
@@ -164,7 +164,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27
-	multichoice 0, 0, 67, 0
+	multichoice 0, 0, MULTI_SHARDS_YG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
@@ -173,7 +173,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58
-	multichoice 0, 0, 68, 0
+	multichoice 0, 0, MULTI_SHARDS_RYG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
@@ -183,7 +183,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94
-	multichoice 0, 0, 69, 0
+	multichoice 0, 0, MULTI_SHARDS_BG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
@@ -192,7 +192,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5
-	multichoice 0, 0, 70, 0
+	multichoice 0, 0, MULTI_SHARDS_RBG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
@@ -202,7 +202,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01
-	multichoice 0, 0, 71, 0
+	multichoice 0, 0, MULTI_SHARDS_YBG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
@@ -212,7 +212,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D
-	multichoice 0, 0, 72, 0
+	multichoice 0, 0, MULTI_SHARDS_RYBG, 0
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
@@ -223,23 +223,23 @@ Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 95
+	setvar VAR_0x8008, ITEM_RED_SHARD
+	setvar VAR_0x8009, ITEM_FIRE_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93
-	setvar VAR_0x8008, 50
-	setvar VAR_0x8009, 96
+	setvar VAR_0x8008, ITEM_YELLOW_SHARD
+	setvar VAR_0x8009, ITEM_THUNDER_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2
-	setvar VAR_0x8008, 49
-	setvar VAR_0x8009, 97
+	setvar VAR_0x8008, ITEM_BLUE_SHARD
+	setvar VAR_0x8009, ITEM_WATER_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1
-	setvar VAR_0x8008, 51
-	setvar VAR_0x8009, 98
+	setvar VAR_0x8008, ITEM_GREEN_SHARD
+	setvar VAR_0x8009, ITEM_LEAF_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0

data/maps/RustboroCity/scripts.inc

@@ -78,7 +78,7 @@ RustboroCity_EventScript_1E07AC:: @ 81E07AC
 
 RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV
-	special sp106_CreateStartMenu
+	special ScriptMenu_CreateStartMenuForPokenavTutorial
 	waitstate
 	switch VAR_RESULT
 	case 0, RustboroCity_EventScript_1E07AC
@@ -88,7 +88,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	case 5, RustboroCity_EventScript_1E07AC
 	case 6, RustboroCity_EventScript_1E07AC
 	case 7, RustboroCity_EventScript_1E07AC
-	case 127, RustboroCity_EventScript_1E07AC
+	case MULTI_B_PRESSED, RustboroCity_EventScript_1E07AC
 	special sub_81C72A4
 	waitstate
 	delay 20