Merge with master

asm/macros/event.inc

@@ -878,15 +878,15 @@
 	.endm
 
 	@ Displays a box containing the front sprite for the specified (species) Pokemon species.
-	.macro drawmonpic species:req, x:req, y:req
+	.macro showmonpic species:req, x:req, y:req
 	.byte 0x75
 	.2byte \species
 	.byte \x
 	.byte \y
 	.endm
 
-	@ Hides all boxes displayed with drawmonpic.
-	.macro erasemonpic
+	@ Hides all boxes displayed with showmonpic.
+	.macro hidemonpic
 	.byte 0x76
 	.endm
 
@@ -1468,31 +1468,34 @@
 	.byte \location
 	.endm
 
-	.macro mossdeepgym1 unknown:req
+	@ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Moves the objects on the colored puzzle specified by puzzleNumber one rotation
+	.macro moverotatingtileobjects puzzleNumber:req
 	.byte 0xd3
-	.2byte \unknown
+	.2byte \puzzleNumber
 	.endm
 
-	.macro mossdeepgym2
+	@ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Updates the facing direction of all objects on the puzzle tiles
+	.macro turnrotatingtileobjects
 	.byte 0xd4
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro mossdeepgym3 var:req
+	@ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Allocates memory for the puzzle objects. isTrickHouse is needed to determine which of the two maps the puzzle is on, in order to know where in the tileset the puzzle tiles start. In FireRed, this command is a nop.
+	.macro initrotatingtilepuzzle isTrickHouse:req
 	.byte 0xd5
-	.2byte \var
+	.2byte \isTrickHouse
 	.endm
 
-	.macro mossdeepgym4
+	@ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Frees the memory allocated for the puzzle objects.
+	.macro freerotatingtilepuzzle
 	.byte 0xd6
 	.endm
 
-	.macro warp7 map:req, byte:req, word1:req, word2:req
+	.macro warpmossdeepgym map:req, warpId:req, x:req, y:req
 	.byte 0xd7
 	map \map
-	.byte \byte
-	.2byte \word1
-	.2byte \word2
+	.byte \warpId
+	.2byte \x
+	.2byte \y
 	.endm
 
 	.macro cmdD8

data/berry_crush.s

@@ -281,23 +281,23 @@ gUnknown_082F4304:: @ 82F4304
 
 	.align 2
 gUnknown_082F430C:: @ 82F430C
-	spr_template 0x0001, 0x0001, gUnknown_0852491C, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0x0001, 0x0001, gOamData_AffineOff_ObjNormal_64x64, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 	.align 2
 gUnknown_082F4324:: @ 82F4324
-	spr_template 0x0002, 0x0002, gUnknown_08524914, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20
+	spr_template 0x0002, 0x0002, gOamData_AffineOff_ObjNormal_32x32, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20
 
 	.align 2
 gUnknown_082F433C:: @ 82F433C
-	spr_template 0x0003, 0x0002, gUnknown_0852490C, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0x0003, 0x0002, gOamData_AffineOff_ObjNormal_16x16, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 	.align 2
 gUnknown_082F4354:: @ 82F4354
-	spr_template 0x0004, 0x0004, gUnknown_08524944, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0x0004, 0x0004, gOamData_AffineOff_ObjNormal_8x16, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 	.align 2
 gUnknown_082F436C:: @ 82F436C
-	spr_template 0x0005, 0x0005, gUnknown_085249D4, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy
+	spr_template 0x0005, 0x0005, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy
 
 	.align 2
 gUnknown_082F4384:: @ 82F4384

data/event_scripts.s

@@ -1,8 +1,11 @@
 #include "constants/global.h"
 #include "constants/battle.h"
+#include "constants/battle_pike.h"
+#include "constants/battle_pyramid.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_setup.h"
 #include "constants/berry.h"
+#include "constants/cable_club.h"
 #include "constants/contest.h"
 #include "constants/daycare.h"
 #include "constants/decorations.h"
@@ -10,7 +13,9 @@
 #include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
+#include "constants/field_poison.h"
 #include "constants/field_specials.h"
+#include "constants/field_tasks.h"
 #include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/item.h"
@@ -22,13 +27,16 @@
 #include "constants/maps.h"
 #include "constants/metatile_labels.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/pokemon.h"
 #include "constants/script_menu.h"
 #include "constants/secret_bases.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/trade.h"
 #include "constants/trainer_hill.h"
 #include "constants/trainers.h"
+#include "constants/tv.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
 	.include "asm/macros.inc"
@@ -900,7 +908,7 @@ EventScript_PickItemUp:: @ 8271C3A
 	waitfanfare
 	waitmessage
 	bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
 	special CallBattlePyramidFunction
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_271C86
@@ -1018,10 +1026,7 @@ Common_ShowEasyChatScreen:: @ 8271E7C
 	fadescreen 0
 	return
 
-DewfordTown_Gym_EventScript_271E84:: @ 8271E84
-LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84
-MauvilleCity_Gym_EventScript_271E84:: @ 8271E84
-RustboroCity_Gym_EventScript_271E84:: @ 8271E84
+Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
 	clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
@@ -1246,12 +1251,12 @@ EventScript_RegionMap:: @ 827208F
 	end
 
 Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
-	setflag FLAG_SPECIAL_FLAG_0x4001
+	setflag FLAG_DONT_TRANSITION_MUSIC
 	playbgm MUS_M_BOAT, 0
 	return
 
 Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
-	clearflag FLAG_SPECIAL_FLAG_0x4001
+	clearflag FLAG_DONT_TRANSITION_MUSIC
 	fadedefaultbgm
 	return
 
@@ -1273,7 +1278,7 @@ Movement_FerryDepart: @ 82721F0
 	walk_right
 	step_end
 
-PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
+EventScript_HideMrBriney:: @ 82721F8
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
@@ -1296,7 +1301,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216
 
 EventScript_27222B:: @ 827222B
 	delay 30
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	showobjectat 255, MAP_PETALBURG_CITY
 	delay 30
@@ -1569,64 +1574,16 @@ EventScript_CableClub_SetVarResult0:: @ 8273755
 	setvar VAR_RESULT, 0
 	return
 
-BattleFrontier_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-DewfordTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-EverGrandeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-EverGrandeCity_PokemonLeague_2F_EventScript_27375B:: @ 827375B
-FallarborTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-FortreeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-LavaridgeTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-LilycoveCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-MauvilleCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-MossdeepCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-OldaleTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-PacifidlogTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-PetalburgCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-RustboroCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-SlateportCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-SootopolisCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-VerdanturfTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
-	call OldaleTown_PokemonCenter_2F_EventScript_27751B
+Common_EventScript_UnionRoomAttendant:: @ 827375B
+	call CableClub_EventScript_UnionRoomAttendant
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_273761:: @ 8273761
-DewfordTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
-EverGrandeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-EverGrandeCity_PokemonLeague_2F_EventScript_273761:: @ 8273761
-FallarborTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
-FortreeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-LavaridgeTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
-LilycoveCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-MauvilleCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-MossdeepCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-OldaleTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
-PacifidlogTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
-PetalburgCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-RustboroCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-SlateportCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-SootopolisCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
-VerdanturfTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
-	call OldaleTown_PokemonCenter_2F_EventScript_277672
+Common_EventScript_WirelessClubAttendant:: @ 8273761
+	call CableClub_EventScript_WirelessClubAttendant
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_273767:: @ 8273767
-DewfordTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
-EverGrandeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-EverGrandeCity_PokemonLeague_2F_EventScript_273767:: @ 8273767
-FallarborTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
-FortreeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-LavaridgeTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
-LilycoveCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-MauvilleCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-MossdeepCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-OldaleTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
-PacifidlogTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
-PetalburgCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-RustboroCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-SlateportCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-SootopolisCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
-VerdanturfTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
-	call OldaleTown_PokemonCenter_2F_EventScript_2776A4
+Common_EventScript_DirectCornerAttendant:: @ 8273767
+	call CableClub_EventScript_DirectCornerAttendant
 	end
 
 Common_EventScript_RemoveStaticPokemon:: @ 827376D
@@ -1731,6 +1688,7 @@ EventScript_GotoTrainerScript:: @ 82742F6
 	.include "data/scripts/berry_tree.inc"
 	.include "data/scripts/secret_base.inc"
 	.include "data/scripts/cable_club.inc"
+	.include "data/text/cable_club.inc"
 	.include "data/scripts/contest_hall.inc"
 	.include "data/text/contest_strings.inc"
 	.include "data/text/contest_link.inc"

data/maps/AquaHideout_B2F/scripts.inc

@@ -31,14 +31,14 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09
 AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 4
-	applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
 	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
 	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
 	waitmovement 0
 	removeobject VAR_0x8009

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -43,7 +43,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT
@@ -114,7 +114,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
 	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	setvar VAR_0x8004, 4
 	special CallBattleDomeFunction
@@ -163,7 +163,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	compare VAR_TEMP_2, 0
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
 	end
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
-	applymovement 1, Common_Movement_WalkInPlaceRight
-	applymovement 3, Common_Movement_WalkInPlaceRight
-	applymovement 4, Common_Movement_WalkInPlaceRight
-	applymovement 5, Common_Movement_WalkInPlaceLeft
-	applymovement 6, Common_Movement_WalkInPlaceLeft
-	applymovement 7, Common_Movement_WalkInPlaceLeft
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement 3, Common_Movement_WalkInPlaceFastestRight
+	applymovement 4, Common_Movement_WalkInPlaceFastestRight
+	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
+	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
+	applymovement 7, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -278,10 +278,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	waitfanfare
 	setvar VAR_0x8004, 13
 	special CallFrontierUtilFunc
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
+	applymovement 2, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
-	applymovement 1, Common_Movement_WalkInPlaceRight
-	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement 3, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -321,10 +321,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	waitfanfare
 	setvar VAR_0x8004, 13
 	special CallFrontierUtilFunc
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
+	applymovement 2, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
-	applymovement 1, Common_Movement_WalkInPlaceRight
-	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement 3, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -13,9 +13,9 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 20
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 24
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
 	setvar VAR_0x8005, 1
 	special CallBattlePikeFunction
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -26,16 +26,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
 
 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
 	special HealPlayerParty
-	setvar VAR_0x8004, 27
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
 	special CallBattlePikeFunction
 	lockall
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
 	special CallBattlePikeFunction
@@ -68,21 +68,21 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
 	setvar VAR_0x8004, 8
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattlePikeFunction
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 3
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattlePikeFunction
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, 27
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
 	special CallBattlePikeFunction
 	message BattleFrontier_BattlePikeLobby_Text_25C1DF
 	waitmessage
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	playse SE_SAVE
@@ -103,15 +103,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
 	special CallBattlePikeFunction
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, 27
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	playse SE_SAVE
@@ -176,17 +176,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 28
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
 	special CallBattlePikeFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 1
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 26
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
 	special CallBattlePikeFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 3
@@ -197,7 +197,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	delay 2
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 26
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
 	special CallBattlePikeFunction
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C

data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc

@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
 	special CallBattlePikeFunction
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6
@@ -27,7 +27,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
 	delay 16
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
 	waitmovement 0
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -63,7 +63,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
 	closemessage
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
 	waitmovement 0
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -102,7 +102,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
 	lockall
 	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF
 	waitmovement 0
-	setvar VAR_0x8004, 23
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
 	special CallBattlePikeFunction
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC
@@ -136,7 +136,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
 	waitse
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7
 	waitmovement 0
-	setvar VAR_0x8004, 22
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
 	special CallBattlePikeFunction
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
@@ -217,11 +217,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
 	setvar VAR_0x8005, 1
 	special CallBattlePikeFunction
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattlePikeFunction
@@ -279,7 +279,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
 	waitmovement 0
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -287,7 +287,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
 	delay 16
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
 	waitmovement 0
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
 	setvar VAR_0x8005, 1
 	special CallBattlePikeFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -317,7 +317,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
 	message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1
 	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA
 	waitmovement 0
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
 	special CallBattlePikeFunction
 	copyvar VAR_0x8004, VAR_RESULT
 	compare VAR_0x8004, 0
@@ -335,7 +335,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
 	waitse
 	playmoncry SPECIES_KIRLIA, 0
 	waitmoncry
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
 	special CallBattlePikeFunction
 	compare VAR_RESULT, 2
 	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
@@ -345,7 +345,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
 	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
 	compare VAR_RESULT, 4
 	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
 	special CallBattlePikeFunction
 	waitstate
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
@@ -372,13 +372,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
 	waitse
 	playmoncry SPECIES_DUSCLOPS, 0
 	waitmoncry
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
 	special CallBattlePikeFunction
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
 	special CallBattlePikeFunction
 	waitstate
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
@@ -578,7 +578,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
 	special CallBattlePikeFunction
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B
@@ -588,7 +588,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
 	lock
 	faceplayer
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
 	special CallBattlePikeFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
@@ -605,7 +605,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
 	special CallBattlePikeFunction
 	compare VAR_RESULT, 2
 	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881

data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc

@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
 
 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
 	special CallBattlePikeFunction
 	end
 

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -35,7 +35,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	lockall
 	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75
 	waitmessage
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
 	setvar VAR_0x8005, 1
 	special CallBattlePikeFunction
 	playse SE_SAVE
@@ -137,7 +137,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
 	message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
 	setvar VAR_0x8005, 2
 	special CallBattlePikeFunction
 	playse SE_SAVE
@@ -161,12 +161,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
+	case 0, BattleFrontier_BattlePike_EventScript_Retire
 	release
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
-	setvar VAR_0x8004, 17
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
 	special CallBattlePikeFunction
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
@@ -189,7 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
-	setvar VAR_0x8004, 19
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
 	special CallBattlePikeFunction
 	compare VAR_RESULT, 4
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
@@ -209,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A
-	setvar VAR_0x8004, 18
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID
 	special CallBattlePikeFunction
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39
@@ -230,7 +230,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60
-	setvar VAR_0x8004, 19
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
 	special CallBattlePikeFunction
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A

data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc

@@ -12,7 +12,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
 	lockall
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 1
 	setvar VAR_0x8007, 55
@@ -38,7 +38,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
 	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 0
 	special CallFrontierUtilFunc
@@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 	setvar VAR_TEMP_D, 1
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
-	setvar VAR_0x8004, 17
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
 	special CallBattlePyramidFunction
 	end
 
@@ -77,18 +77,18 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 7
 	setvar VAR_0x8006, 255
 	special CallBattlePyramidFunction
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
 	special CallBattlePyramidFunction
 	special HealPlayerParty
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
@@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	special SavePlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
@@ -118,7 +118,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
 	setvar VAR_0x8005, 32
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
@@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 7
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
 	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
@@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 
 BattlePyramid_TrainerBattle:: @ 8252C4F
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
 	special CallBattlePyramidFunction
 	waitmessage
 	waitbuttonpress
@@ -163,12 +163,12 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
 	end
 
 BattlePyramid_FindItemBall:: @ 8252C6A
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
 	special CallBattlePyramidFunction
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
 	goto_if_eq BattlePyramid_FindItemBall_End
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
 	special CallBattlePyramidFunction
 
 BattlePyramid_FindItemBall_End:: @ 8252C87

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -32,11 +32,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	playse SE_EXPMAX
 	waitse
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
@@ -68,7 +68,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	setvar VAR_0x8004, 8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
 	special CallBattlePyramidFunction
 	special HealPlayerParty
 	message BattleFrontier_BattlePyramidLobby_Text_2519F8
@@ -81,9 +81,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
 	setvar VAR_0x8005, 0
 	special CallBattlePyramidFunction
 	playse SE_SAVE
@@ -98,7 +98,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	setvar VAR_0x8004, 8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
 	special CallBattlePyramidFunction
 	special HealPlayerParty
 	lockall
@@ -108,11 +108,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	waitse
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
 	setvar VAR_0x8005, 0
 	special CallBattlePyramidFunction
 	playse SE_SAVE
@@ -179,9 +179,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattlePyramidFunction
@@ -193,9 +193,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
 	special LoadPlayerParty
 	closemessage
@@ -282,7 +282,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
 	setvar VAR_0x8005, 5
 	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
@@ -292,7 +292,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattlePyramidFunction
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
@@ -300,7 +300,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
 	setvar VAR_0x8005, 6
 	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
@@ -310,7 +310,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
 	setvar VAR_0x8005, 4
 	special CallBattlePyramidFunction
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
@@ -437,7 +437,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -6,7 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
 	.byte 0
 
 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
 	setvar VAR_0x8005, 200
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
@@ -69,7 +69,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
 	end
 
 BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	special SavePlayerParty
@@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -230,7 +230,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
 BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
 	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A
 	waitmovement 0
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6
+	applymovement 3, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
 	applymovement 2, Common_Movement_ExclamationMark

data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc

@@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
 	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
 	waitmovement 0
 	delay 40
-	applymovement 3, Common_Movement_WalkInPlaceUp
-	applymovement 2, Common_Movement_WalkInPlaceUp
+	applymovement 3, Common_Movement_WalkInPlaceFastestUp
+	applymovement 2, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	opendoor 7, 1
 	waitdooranim

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -926,16 +926,16 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, USING_BATTLE_TOWER
 	message gText_PleaseWaitForLink
 	waitmessage
 	setvar VAR_0x8005, 0
-	special sub_80B2DA4
+	special TryBattleLinkup
 	waitstate
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2
+	goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady
 	compare VAR_RESULT, 3
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
 	compare VAR_RESULT, 4
@@ -943,7 +943,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
 	compare VAR_RESULT, 5
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	compare VAR_RESULT, 6
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5
+	goto_if_eq CableClub_EventScript_AbortLinkConnectionError
 	compare VAR_RESULT, 11
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
 	end
@@ -952,7 +952,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
 	special CloseLink
 	compare VAR_0x8005, 3
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
-	msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT
+	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
 	release
 	end
 
@@ -965,7 +965,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
 BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
 	msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT
 	special CloseLink
-	msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT
+	msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT
 	release
 	end
 
@@ -1020,7 +1020,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
-	message BattleFrontier_BattleTowerLobby_Text_2792CD
+	message CableClub_Text_ChooseGroupLeaderOfTwo
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, 0
 	switch VAR_RESULT
@@ -1031,7 +1031,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
-	call BattleFrontier_BattleTowerLobby_EventScript_277B30
+	call CableClub_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
 	compare VAR_RESULT, 5
@@ -1044,7 +1044,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
-	call BattleFrontier_BattleTowerLobby_EventScript_277B35
+	call CableClub_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
 	compare VAR_RESULT, 5

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
 	.byte 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
-	setvar VAR_0x8004, 17
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
 	special CallBattlePyramidFunction
 	end
 
@@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
 	waitmovement 0
 	copyobjectxytoperm 1
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
 	special HealPlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	opendoor 10, 1
 	waitdooranim

data/maps/BattleFrontier_Lounge6/scripts.inc

@@ -5,7 +5,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
 	lock
 	faceplayer
 	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
-	setvar VAR_0x8008, 3
+	setvar VAR_0x8008, INGAME_TRADE_MEOWTH
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT

data/maps/BattleFrontier_Lounge7/scripts.inc

@@ -265,7 +265,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
 	fadescreen 1
 	special CloseBattlePointsWindow
 	special CloseBattleFrontierTutorWindow
-	special sub_81B892C
+	special OpenPartyMenuForMoveTutor
 	waitstate
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_Lounge7_EventScript_265645

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
 
 BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
 	closemessage
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
-	applymovement 9, Common_Movement_WalkInPlaceRight
+	applymovement 9, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
-	applymovement 10, Common_Movement_WalkInPlaceLeft
+	applymovement 10, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
 	closemessage
 	delay 25
-	applymovement 9, Common_Movement_WalkInPlaceUp
-	applymovement 10, Common_Movement_WalkInPlaceUp
+	applymovement 9, Common_Movement_WalkInPlaceFastestUp
+	applymovement 10, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
@@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
-	applymovement 14, Common_Movement_WalkInPlaceUp
+	applymovement 14, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 

data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904

data/maps/BattleFrontier_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc

@@ -1,19 +1,20 @@
 BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9
+	call CableClub_EventScript_Colosseum
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF
+	call CableClub_EventScript_TradeCenter
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/BattleFrontier_ReceptionGate/scripts.inc

@@ -38,9 +38,9 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
 	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
 	msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Common_Movement_WalkInPlaceUp
-	applymovement 2, Common_Movement_WalkInPlaceUp
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
+	applymovement 2, Common_Movement_WalkInPlaceFastestUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
 	end
 
 BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
-	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
-	applymovement 1, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
-	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
-	applymovement 1, Common_Movement_WalkInPlaceLeft
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 

data/maps/BirthIsland_Harbor/scripts.inc

@@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
 	goto_if_eq BirthIsland_Harbor_EventScript_2680A2
 	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR

data/maps/CaveOfOrigin_B1F/scripts.inc

@@ -6,7 +6,7 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
 	faceplayer
 	msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 60
 	playse SE_PIN

data/maps/DewfordTown_Gym/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Gym_EventScript_1FC7C2",
+      "script": "DewfordTown_Gym_EventScript_Brawly",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC8B7",
+      "script": "DewfordTown_Gym_EventScript_Takao",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC8D9",
+      "script": "DewfordTown_Gym_EventScript_Jocelyn",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "DewfordTown_Gym_EventScript_1FC8FB",
+      "script": "DewfordTown_Gym_EventScript_Laura",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Gym_EventScript_1FC983",
+      "script": "DewfordTown_Gym_EventScript_GymGuide",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC93F",
+      "script": "DewfordTown_Gym_EventScript_Cristian",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC961",
+      "script": "DewfordTown_Gym_EventScript_Lilith",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "DewfordTown_Gym_EventScript_1FC91D",
+      "script": "DewfordTown_Gym_EventScript_Brenden",
       "flag": "0"
     }
   ],
@@ -143,7 +143,7 @@
       "y": 23,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9A2"
+      "script": "DewfordTown_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -151,7 +151,7 @@
       "y": 23,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9B2"
+      "script": "DewfordTown_Gym_EventScript_RightGymStatue"
     },
     {
       "type": "sign",
@@ -159,7 +159,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9A2"
+      "script": "DewfordTown_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -167,7 +167,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9B2"
+      "script": "DewfordTown_Gym_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/DewfordTown_Gym/scripts.inc

@@ -3,186 +3,181 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C
 	.byte 0
 
 DewfordTown_Gym_OnTransition: @ 81FC642
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	end
 
-DewfordTown_Gym_EventScript_1FC648:: @ 81FC648
+DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648
 	checktrainerflag TRAINER_BRAWLY_1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6A2
-	call DewfordTown_Gym_EventScript_1FC768
+	goto_if_eq DewfordTown_Gym_EventScript_SetLightsOn
+	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	copyvar VAR_0x8001, VAR_0x8000
 	compare VAR_0x8000, 0
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6BE
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius7
 	compare VAR_0x8000, 1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6BA
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius6
 	compare VAR_0x8000, 2
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6B6
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius5
 	compare VAR_0x8000, 3
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6B2
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius4
 	compare VAR_0x8000, 4
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6AE
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius3
 	compare VAR_0x8000, 5
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6AA
-	goto DewfordTown_Gym_EventScript_1FC6A6
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius2
+	goto DewfordTown_Gym_EventScript_SetFlashRadius1
 
-DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2
+DewfordTown_Gym_EventScript_SetLightsOn:: @ 81FC6A2
 	setflashradius 0
 	return
 
-DewfordTown_Gym_EventScript_1FC6A6:: @ 81FC6A6
+DewfordTown_Gym_EventScript_SetFlashRadius1:: @ 81FC6A6
 	setflashradius 1
 	return
 
-DewfordTown_Gym_EventScript_1FC6AA:: @ 81FC6AA
+DewfordTown_Gym_EventScript_SetFlashRadius2:: @ 81FC6AA
 	setflashradius 2
 	return
 
-DewfordTown_Gym_EventScript_1FC6AE:: @ 81FC6AE
+DewfordTown_Gym_EventScript_SetFlashRadius3:: @ 81FC6AE
 	setflashradius 3
 	return
 
-DewfordTown_Gym_EventScript_1FC6B2:: @ 81FC6B2
+DewfordTown_Gym_EventScript_SetFlashRadius4:: @ 81FC6B2
 	setflashradius 4
 	return
 
-DewfordTown_Gym_EventScript_1FC6B6:: @ 81FC6B6
+DewfordTown_Gym_EventScript_SetFlashRadius5:: @ 81FC6B6
 	setflashradius 5
 	return
 
-DewfordTown_Gym_EventScript_1FC6BA:: @ 81FC6BA
+DewfordTown_Gym_EventScript_SetFlashRadius6:: @ 81FC6BA
 	setflashradius 6
 	return
 
-DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE
+DewfordTown_Gym_EventScript_SetFlashRadius7:: @ 81FC6BE
 	setflashradius 7
 	return
 
-DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2
-	call DewfordTown_Gym_EventScript_1FC768
+DewfordTown_Gym_EventScript_BrightenRoom:: @ 81FC6C2
+	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	nop1
 	compare VAR_0x8000, VAR_0x8001
-	goto_if_eq DewfordTown_Gym_EventScript_1FC71A
+	goto_if_eq DewfordTown_Gym_EventScript_NoLightChange
 	copyvar VAR_0x8001, VAR_0x8000
 	compare VAR_0x8000, 1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC71B
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash1Trainer
 	compare VAR_0x8000, 2
-	goto_if_eq DewfordTown_Gym_EventScript_1FC726
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash2Trainers
 	compare VAR_0x8000, 3
-	goto_if_eq DewfordTown_Gym_EventScript_1FC731
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash3Trainers
 	compare VAR_0x8000, 4
-	goto_if_eq DewfordTown_Gym_EventScript_1FC73C
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash4Trainers
 	compare VAR_0x8000, 5
-	goto_if_eq DewfordTown_Gym_EventScript_1FC747
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash5Trainers
 	compare VAR_0x8000, 6
-	goto_if_eq DewfordTown_Gym_EventScript_1FC752
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash6Trainers
 
-DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A
+DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A
 	return
 
-DewfordTown_Gym_EventScript_1FC71B:: @ 81FC71B
+@ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius
+DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B
 	playse SE_MU_PACHI
 	animateflash 6
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC726:: @ 81FC726
+DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726
 	playse SE_MU_PACHI
 	animateflash 5
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC731:: @ 81FC731
+DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731
 	playse SE_MU_PACHI
 	animateflash 4
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC73C:: @ 81FC73C
+DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C
 	playse SE_MU_PACHI
 	animateflash 3
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC747:: @ 81FC747
+DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747
 	playse SE_MU_PACHI
 	animateflash 2
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC752:: @ 81FC752
+DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752
 	playse SE_MU_PACHI
 	animateflash 1
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D
+DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D
 	playse SE_MU_PACHI
 	animateflash 0
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC768:: @ 81FC768
+DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768
 	setvar VAR_0x8000, 0
 	checktrainerflag TRAINER_TAKAO
-	goto_if_lt DewfordTown_Gym_EventScript_1FC77B
+	goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn
 	addvar VAR_0x8000, 1
-
-DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B
+DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B
 	checktrainerflag TRAINER_JOCELYN
-	goto_if_lt DewfordTown_Gym_EventScript_1FC789
+	goto_if_lt DewfordTown_Gym_EventScript_CheckLaura
 	addvar VAR_0x8000, 1
-
-DewfordTown_Gym_EventScript_1FC789:: @ 81FC789
+DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789
 	checktrainerflag TRAINER_LAURA
-	goto_if_lt DewfordTown_Gym_EventScript_1FC797
+	goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden
 	addvar VAR_0x8000, 1
-
-DewfordTown_Gym_EventScript_1FC797:: @ 81FC797
+DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797
 	checktrainerflag TRAINER_BRENDEN
-	goto_if_lt DewfordTown_Gym_EventScript_1FC7A5
+	goto_if_lt DewfordTown_Gym_EventScript_CheckCristian
 	addvar VAR_0x8000, 1
-
-DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5
+DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5
 	checktrainerflag TRAINER_CRISTIAN
-	goto_if_lt DewfordTown_Gym_EventScript_1FC7B3
+	goto_if_lt DewfordTown_Gym_EventScript_CheckLilith
 	addvar VAR_0x8000, 1
-
-DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3
+DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3
 	checktrainerflag TRAINER_LILITH
-	goto_if_lt DewfordTown_Gym_EventScript_1FC7C1
+	goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers
 	addvar VAR_0x8000, 1
-
-DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1
+DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1
 	return
 
-DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
-	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC
+DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2
+	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreBattle, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC89C
-	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1FC878
-	msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch
+	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_GiveBulkUp2
+	msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
-	call DewfordTown_Gym_EventScript_1FC75D
-	message DewfordTown_Gym_Text_1FD07D
+DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7
+	call DewfordTown_Gym_EventScript_AnimateFlashFullBrightness
+	message DewfordTown_Gym_Text_ReceivedKnuckleBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag FLAG_BADGE02_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq DewfordTown_Gym_EventScript_271E84
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 2
 	call Common_EventScript_SetGymTrainers
-	call DewfordTown_Gym_EventScript_1FC855
+	call DewfordTown_Gym_EventScript_GiveBulkUp
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox DewfordTown_Gym_Text_1FD1E0, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_RegisteredBrawly, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -192,124 +187,124 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
+DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
-	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	return
 
-DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
+DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C
-	trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE
-	msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_BrawlyRematch:: @ 81FC89C
+	trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreRematch, DewfordTown_Gym_Text_BrawlyRematchDefeat, DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons
+	msgbox DewfordTown_Gym_Text_BrawlyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7
-	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2
-	msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7
+	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoPreBattle, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom
+	msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_TakaoBrightenRoom:: @ 81FC8D2
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9
-	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4
-	msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9
+	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynPreBattle, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom
+	msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_JocelynBrightenRoom:: @ 81FC8F4
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB
-	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916
-	msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB
+	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraPreBattle, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom
+	msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC916:: @ 81FC916
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 81FC916
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D
-	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938
-	msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D
+	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenPreBattle, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom
+	msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC938:: @ 81FC938
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_BrendenBrightenRoom:: @ 81FC938
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F
-	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A
-	msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F
+	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianPreBattle, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom
+	msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_CristianBrightenRoom:: @ 81FC95A
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC961:: @ 81FC961
-	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C
-	msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Lilith:: @ 81FC961
+	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithPreBattle, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom
+	msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_LilithBrightenRoom:: @ 81FC97C
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC983:: @ 81FC983
+DewfordTown_Gym_EventScript_GymGuide:: @ 81FC983
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_1FC998
-	msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_GymGuidePostVictory
+	msgbox DewfordTown_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC998:: @ 81FC998
-	msgbox DewfordTown_Gym_Text_1FCB5C, MSGBOX_DEFAULT
+DewfordTown_Gym_EventScript_GymGuidePostVictory:: @ 81FC998
+	msgbox DewfordTown_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2
+DewfordTown_Gym_EventScript_LeftGymStatue:: @ 81FC9A2
 	lockall
-	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2
-	goto DewfordTown_Gym_EventScript_1FC9CC
+	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified
+	goto DewfordTown_Gym_EventScript_GymStatue
 	end
 
-DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2
+DewfordTown_Gym_EventScript_RightGymStatue:: @ 81FC9B2
 	lockall
-	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2
-	goto DewfordTown_Gym_EventScript_1FC9CC
+	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified
+	goto DewfordTown_Gym_EventScript_GymStatue
 	end
 
-DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2
-	msgbox DewfordTown_Gym_Text_1FD28B, MSGBOX_DEFAULT
+DewfordTown_Gym_EventScript_GymStatueCertified:: @ 81FC9C2
+	msgbox DewfordTown_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC
-	msgbox DewfordTown_Gym_Text_1FD272, MSGBOX_DEFAULT
+DewfordTown_Gym_EventScript_GymStatue:: @ 81FC9CC
+	msgbox DewfordTown_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6
+DewfordTown_Gym_Text_GymGuideAdvice: @ 81FC9D6
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "DEWFORD's GYM LEADER BRAWLY commands\n"
@@ -325,88 +320,88 @@ DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6
 	.string "the TRAINERS in your way.\p"
 	.string "Hey, okay, go for it!$"
 
-DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C
+DewfordTown_Gym_Text_GymGuidePostVictory: @ 81FCB5C
 	.string "Whoah! It's turned too bright in here!\p"
 	.string "Your future is bright, too!$"
 
-DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F
+DewfordTown_Gym_Text_TakaoPreBattle: @ 81FCB9F
 	.string "Might is right!\n"
 	.string "Come on!$"
 
-DewfordTown_Gym_Text_1FCBB8: @ 81FCBB8
+DewfordTown_Gym_Text_TakaoDefeat: @ 81FCBB8
 	.string "Not enough power…$"
 
-DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA
+DewfordTown_Gym_Text_TakaoPostBattle: @ 81FCBCA
 	.string "Your skill overcame my strength!\n"
 	.string "Your technique is commendable!$"
 
-DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A
+DewfordTown_Gym_Text_JocelynPreBattle: @ 81FCC0A
 	.string "There's no need for BRAWLY to be\n"
 	.string "involved!\p"
 	.string "I'll crush you!$"
 
-DewfordTown_Gym_Text_1FCC45: @ 81FCC45
+DewfordTown_Gym_Text_JocelynDefeat: @ 81FCC45
 	.string "But… How?\n"
 	.string "How could I lose so easily?$"
 
-DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B
+DewfordTown_Gym_Text_JocelynPostBattle: @ 81FCC6B
 	.string "I'm not going to waste this loss.\n"
 	.string "I'll use it to motivate me to train!\p"
 	.string "One day I'll become a GYM LEADER…\p"
 	.string "No, I'll become the POKéMON LEAGUE\n"
 	.string "CHAMPION!$"
 
-DewfordTown_Gym_Text_1FCD01: @ 81FCD01
+DewfordTown_Gym_Text_LauraPreBattle: @ 81FCD01
 	.string "Don't you dare brush me off!\n"
 	.string "It's not my fault if you cry!$"
 
-DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C
+DewfordTown_Gym_Text_LauraDefeat: @ 81FCD3C
 	.string "Waaaaaaah!\n"
 	.string "I lost!$"
 
-DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F
+DewfordTown_Gym_Text_LauraPostBattle: @ 81FCD4F
 	.string "I battle in the dark to make my heart\n"
 	.string "stronger.\p"
 	.string "But because it's so dark, I can never\n"
 	.string "see BRAWLY's face…$"
 
-DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8
+DewfordTown_Gym_Text_LilithPreBattle: @ 81FCDB8
 	.string "Ufufu…\n"
 	.string "Are you stumbling around in the dark?$"
 
-DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5
+DewfordTown_Gym_Text_LilithDefeat: @ 81FCDE5
 	.string "Oh, you…\n"
 	.string "I don't want to know you!$"
 
-DewfordTown_Gym_Text_1FCE08: @ 81FCE08
+DewfordTown_Gym_Text_LilithPostBattle: @ 81FCE08
 	.string "You deserve to stay lost and end up\n"
 	.string "back at the entrance again!$"
 
-DewfordTown_Gym_Text_1FCE48: @ 81FCE48
+DewfordTown_Gym_Text_BrendenPreBattle: @ 81FCE48
 	.string "I'll show you the gumption of\n"
 	.string "a sailing man!$"
 
-DewfordTown_Gym_Text_1FCE75: @ 81FCE75
+DewfordTown_Gym_Text_BrendenDefeat: @ 81FCE75
 	.string "How'd this happen?\n"
 	.string "It's not like me to lose this way!$"
 
-DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB
+DewfordTown_Gym_Text_BrendenPostBattle: @ 81FCEAB
 	.string "Oh, aye! You're worthy of seeing\n"
 	.string "our GYM LEADER.$"
 
-DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC
+DewfordTown_Gym_Text_CristianPreBattle: @ 81FCEDC
 	.string "If you mean to pass, it has to be\n"
 	.string "through me!$"
 
-DewfordTown_Gym_Text_1FCF0A: @ 81FCF0A
+DewfordTown_Gym_Text_CristianDefeat: @ 81FCF0A
 	.string "Grrrrr!\n"
 	.string "Vastly overpowered!$"
 
-DewfordTown_Gym_Text_1FCF26: @ 81FCF26
+DewfordTown_Gym_Text_CristianPostBattle: @ 81FCF26
 	.string "You win!\n"
 	.string "Go after that BADGE!$"
 
-DewfordTown_Gym_Text_1FCF44: @ 81FCF44
+DewfordTown_Gym_Text_BrawlyPreBattle: @ 81FCF44
 	.string "I'm BRAWLY!\n"
 	.string "DEWFORD's GYM LEADER!\p"
 	.string "I've been churned in the rough waves\n"
@@ -415,18 +410,18 @@ DewfordTown_Gym_Text_1FCF44: @ 81FCF44
 	.string "So you wanted to challenge me?\n"
 	.string "Let me see what you're made of!$"
 
-DewfordTown_Gym_Text_1FD008: @ 81FD008
+DewfordTown_Gym_Text_BrawlyDefeat: @ 81FD008
 	.string "Whoah, wow! You made a much bigger\n"
 	.string "splash than I expected!\p"
 	.string "You swamped me!\p"
 	.string "Okay, you've got me.\n"
 	.string "Take this GYM BADGE!$"
 
-DewfordTown_Gym_Text_1FD07D: @ 81FD07D
+DewfordTown_Gym_Text_ReceivedKnuckleBadge: @ 81FD07D
 	.string "{PLAYER} received the KNUCKLE BADGE\n"
 	.string "from BRAWLY.$"
 
-DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8
+DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis: @ 81FD0A8
 	.string "The KNUCKLE BADGE makes all POKéMON\n"
 	.string "up to Level 30, even those you get in\l"
 	.string "trades, obey without question.\p"
@@ -435,30 +430,30 @@ DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8
 	.string "If you'd like, use this TECHNICAL\n"
 	.string "MACHINE, too.$"
 
-DewfordTown_Gym_Text_1FD181: @ 81FD181
+DewfordTown_Gym_Text_ExplainBulkUp: @ 81FD181
 	.string "That TM08 contains BULK UP.\p"
 	.string "It's a move that raises both ATTACK\n"
 	.string "and DEFENSE stats.\p"
 	.string "… … … … … …$"
 
-DewfordTown_Gym_Text_1FD1E0: @ 81FD1E0
+DewfordTown_Gym_Text_RegisteredBrawly: @ 81FD1E0
 	.string "Registered GYM LEADER BRAWLY\n"
 	.string "in the POKéNAV.$"
 
-DewfordTown_Gym_Text_1FD20D: @ 81FD20D
+DewfordTown_Gym_Text_BrawlyPostBattle: @ 81FD20D
 	.string "I can see your talent becoming a giant\n"
 	.string "wave to cause a storm of astonishment\l"
 	.string "among TRAINERS one day!$"
 
-DewfordTown_Gym_Text_1FD272: @ 81FD272
+DewfordTown_Gym_Text_GymStatue: @ 81FD272
 	.string "DEWFORD TOWN POKéMON GYM$"
 
-DewfordTown_Gym_Text_1FD28B: @ 81FD28B
+DewfordTown_Gym_Text_GymStatueCertified: @ 81FD28B
 	.string "DEWFORD TOWN POKéMON GYM\p"
 	.string "BRAWLY'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4
+DewfordTown_Gym_Text_BrawlyPreRematch: @ 81FD2C4
 	.string "BRAWLY: A wave may draw back, but it\n"
 	.string "always returns to the shore.\p"
 	.string "A giant wave of a talent like you…\n"
@@ -466,16 +461,16 @@ DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4
 	.string "Show me how much higher\n"
 	.string "you've gone!$"
 
-DewfordTown_Gym_Text_1FD367: @ 81FD367
+DewfordTown_Gym_Text_BrawlyRematchDefeat: @ 81FD367
 	.string "Wow!\n"
 	.string "Swamped again!$"
 
-DewfordTown_Gym_Text_1FD37B: @ 81FD37B
+DewfordTown_Gym_Text_BrawlyPostRematch: @ 81FD37B
 	.string "BRAWLY: Battling is vast and it's deep.\n"
 	.string "You can't see the bottom.\l"
 	.string "It's just like the sea of HOENN!$"
 
-DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE
+DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons: @ 81FD3DE
 	.string "BRAWLY: A wave may draw back, but it\n"
 	.string "always returns to the shore.\p"
 	.string "A giant wave of a talent like you…\n"

data/maps/DewfordTown_Hall/scripts.inc

@@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
 	call DewfordTown_Hall_EventScript_271E8B
 	msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Common_Movement_WalkInPlaceUp
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
@@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
 	call DewfordTown_Hall_EventScript_271E8B
 	msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, Common_Movement_WalkInPlaceUp
+	applymovement 5, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
@@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
 DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
 	compare VAR_FACING, DIR_EAST
 	goto_if_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
@@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
 	return
 
 DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
 	compare VAR_FACING, DIR_WEST
 	goto_if_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 

data/maps/DewfordTown_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E

data/maps/DewfordTown_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/DewfordTown_PokemonCenter_2F/scripts.inc

@@ -1,19 +1,20 @@
 DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+DewfordTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC62A
+	call CableClub_EventScript_Colosseum
 	end
 
-DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+DewfordTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC630
+	call CableClub_EventScript_TradeCenter
 	end
 
-DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+DewfordTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC636
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -1,140 +1,140 @@
 EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame
 	.byte 0
 
 EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF
 	call Common_EventScript_SetupRivalGfxId
 	end
 
-EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F
+EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
+EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E
+EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom
 	.2byte 0
 
-EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
+EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725C1
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4
 	waitmovement 0
 	delay 40
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
-	goto EverGrandeCity_ChampionsRoom_EventScript_228A45
+	goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
     releaseall
     end
 
-EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
+EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42
 	walk_up
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
+EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45
 	playbgm MUS_DAIGO, 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC
-	goto EverGrandeCity_ChampionsRoom_EventScript_228A61
+	msgbox EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat
+	goto EverGrandeCity_ChampionsRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
+EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61
 	playse SE_DOOR
 	setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
 	setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
 	special DrawWholeMapView
-	msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	closemessage
 	playse SE_DOOR
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
 	addobject 2
-	call EverGrandeCity_ChampionsRoom_EventScript_228BFD
+	call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice
 	compare VAR_RESULT, FEMALE
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC
+EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC
 	playbgm MUS_GIRL_SUP, 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1
+EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1
 	playbgm MUS_BOY_SUP, 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
-	msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT
+EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6
+	msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
 	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_228C12
-	msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT
-	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
+	call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth
+	msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT
+	goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
-	msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT
+EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB
+	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
 	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_228C12
-	msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT
-	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
+	call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth
+	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT
+	goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
+EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
 	closemessage
 	addobject 3
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
-	call EverGrandeCity_ChampionsRoom_EventScript_272184
-	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
-	applymovement 1, Common_Movement_WalkInPlaceUp
+	msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT
+	call ProfBirch_EventScript_RatePokedex
+	msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	applymovement 1, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D
-	applymovement 3, Common_Movement_WalkInPlaceUp
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart
+	applymovement 3, Common_Movement_WalkInPlaceFastestUp
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows
 	waitmovement 0
 	delay 20
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations
 	compare VAR_RESULT, FEMALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
 	closemessage
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
@@ -142,32 +142,32 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
 	releaseall
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB
-	msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT
+EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations:: @ 8228BEB
+	msgbox EverGrandeCity_ChampionsRoom_Text_MayCongratulations, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
-	msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT
+EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4
+	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
+EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F
+EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 8228C12
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth
 	waitmovement 0
 	return
 
-EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D
+EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart: @ 8228C1D
 	walk_up
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
+EverGrandeCity_ChampionsRoom_Movement_PlayerExit: @ 8228C20
 	walk_up
 	delay_16
 	walk_up
@@ -175,7 +175,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
 	set_invisible
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
+EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer: @ 8228C26
 	walk_up
 	walk_up
 	walk_up
@@ -186,7 +186,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
 	walk_in_place_fastest_right
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
+EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: @ 8228C2F
 	walk_in_place_fastest_up
 	delay_16
 	walk_in_place_fastest_right
@@ -197,24 +197,24 @@ EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
 	delay_16
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38
+EverGrandeCity_ChampionsRoom_Movement_RivalFollows: @ 8228C38
 	walk_right
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B
+EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart: @ 8228C3B
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F
+EverGrandeCity_ChampionsRoom_Movement_WallaceExit: @ 8228C3F
 	walk_up
 	delay_8
 	set_invisible
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
+EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43
 	walk_up
 	walk_up
 	walk_up
@@ -225,7 +225,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
 	walk_in_place_fastest_left
 	step_end
 
-EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
+EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech: @ 8228C4C
 	.string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
 	.string "That incident in SOOTOPOLIS CITY…\n"
 	.string "That was superb work, putting an end\l"
@@ -248,7 +248,7 @@ EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
 	.string "their POKéMON in HOENN?\p"
 	.string "Show me right here and now!$"
 
-EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC
+EverGrandeCity_ChampionsRoom_Text_Defeat: @ 8228EAC
 	.string "I, the CHAMPION, fall in defeat…\p"
 	.string "That was wonderful work.\n"
 	.string "You were elegant, infuriatingly so.\l"
@@ -257,7 +257,7 @@ EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC
 	.string "You are a truly noble POKéMON\n"
 	.string "TRAINER!$"
 
-EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66
+EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech: @ 8228F66
 	.string "WALLACE: The POKéMON you sent into\n"
 	.string "battle…\p"
 	.string "At times they danced like a spring\n"
@@ -272,29 +272,29 @@ EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66
 	.string "I now proclaim you to be the new\n"
 	.string "HOENN region…$"
 
-EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA
+EverGrandeCity_ChampionsRoom_Text_MayAdvice: @ 82290CA
 	.string "MAY: {PLAYER}{KUN}!\p"
 	.string "Here's some advice before you challenge\n"
 	.string "the CHAMPION…$"
 
-EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B
+EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver: @ 822910B
 	.string "MAY: Huh?\n"
 	.string "What, what, what?\p"
 	.string "{PLAYER}{KUN}…\n"
 	.string "Could it be that…\l"
 	.string "It's already over?$"
 
-EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152
+EverGrandeCity_ChampionsRoom_Text_BrendanAdvice: @ 8229152
 	.string "BRENDAN: {PLAYER}!\p"
 	.string "How would you like some advice before\n"
 	.string "you challenge the CHAMPION?…$"
 
-EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2
+EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon: @ 82291A2
 	.string "BRENDAN: {PLAYER}…\p"
 	.string "Are you trying to tell me…\n"
 	.string "You've beaten the CHAMPION?$"
 
-EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6
+EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex: @ 82291E6
 	.string "PROF. BIRCH: See?\n"
 	.string "What did I tell you, {RIVAL}?\p"
 	.string "Didn't I tell you that you don't need\n"
@@ -310,25 +310,25 @@ EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6
 	.string "What became of your POKéDEX?\n"
 	.string "Here, let me see.$"
 
-EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D
+EverGrandeCity_ChampionsRoom_Text_BirchCongratulations: @ 822934D
 	.string "PROF. BIRCH: Anyways,\n"
 	.string "congratulations!\p"
 	.string "Now, go proudly into the final room!$"
 
-EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399
+EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe: @ 8229399
 	.string "WALLACE: {PLAYER}{KUN}…\p"
 	.string "No, let me rephrase that properly.\p"
 	.string "The new CHAMPION!\p"
 	.string "Come with me.$"
 
-EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB
+EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside: @ 82293EB
 	.string "WALLACE: I'm sorry, but…\p"
 	.string "From here on, only those TRAINERS who\n"
 	.string "have become CHAMPIONS may enter.\p"
 	.string "You'll have to wait outside with\n"
 	.string "PROF. BIRCH.$"
 
-EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479
+EverGrandeCity_ChampionsRoom_Text_MayCongratulations: @ 8229479
 	.string "MAY: Groan…\p"
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
@@ -337,7 +337,7 @@ EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479
 	.string "{PLAYER}{KUN}!\n"
 	.string "Honestly, congratulations!$"
 
-EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5
+EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations: @ 82294F5
 	.string "BRENDAN: Whaaaat?! … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "It can't be helped if that's the rule.\p"

data/maps/EverGrandeCity_DrakesRoom/map.json

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

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -1,67 +1,68 @@
 EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
 	.byte 0
 
-EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6
+@ Unused, Drake uses Sidneys identical OnWarp for some reason
+EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
+EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
-	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
+EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB
+	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
+EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 82286C5
 	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
 
-EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
-	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
+EverGrandeCity_DrakesRoom_OnLoad: @ 82286D2
+	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 4
-	call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
+	call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7
-	call EverGrandeCity_DrakesRoom_EventScript_2724BC
+EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82286E7
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED
-	call EverGrandeCity_DrakesRoom_EventScript_27255F
+EverGrandeCity_DrakesRoom_EventScript_CloseDoor:: @ 82286ED
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3
+EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A
+	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895
-	goto EverGrandeCity_DrakesRoom_EventScript_228724
+	msgbox EverGrandeCity_DrakesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat
+	goto EverGrandeCity_DrakesRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A
-	msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT
+EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 822871A
+	msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724
+EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
 	setvar VAR_0x8004, 0
 	special sub_813BF7C
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_2723F8
-	msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E
+EverGrandeCity_DrakesRoom_Text_PreBattleSpeech: @ 822873E
 	.string "I am the last of the POKéMON LEAGUE\n"
 	.string "ELITE FOUR, DRAKE the DRAGON master!\p"
 	.string "In their natural state, POKéMON are\n"
@@ -74,10 +75,10 @@ EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E
 	.string "If you don't, then you will never\n"
 	.string "prevail over me!$"
 
-EverGrandeCity_DrakesRoom_Text_228895: @ 8228895
+EverGrandeCity_DrakesRoom_Text_Defeat: @ 8228895
 	.string "Superb, it should be said.$"
 
-EverGrandeCity_DrakesRoom_Text_2288B0: @ 82288B0
+EverGrandeCity_DrakesRoom_Text_PostBattleSpeech: @ 82288B0
 	.string "You deserve every credit for coming\n"
 	.string "this far as a TRAINER of POKéMON.\p"
 	.string "You do seem to know what is needed.\p"

data/maps/EverGrandeCity_GlaciasRoom/map.json

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

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -1,65 +1,65 @@
 EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp
 	.byte 0
 
-EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C
+EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
+EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
-	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
+EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431
+	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
+EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 822843B
 	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
 
-EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
-	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
+EverGrandeCity_GlaciasRoom_OnLoad: @ 8228448
+	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 3
-	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
+	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D
-	call EverGrandeCity_GlaciasRoom_EventScript_2724BC
+EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom:: @ 822845D
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463
-	call EverGrandeCity_GlaciasRoom_EventScript_27255F
+EverGrandeCity_GlaciasRoom_EventScript_CloseDoor:: @ 8228463
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469
+EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490
+	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4
-	goto EverGrandeCity_GlaciasRoom_EventScript_22849A
+	msgbox EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat
+	goto EverGrandeCity_GlaciasRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490
-	msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT
+EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech:: @ 8228490
+	msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A
+EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A
 	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_2723F8
-	msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC
+EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech: @ 82284AC
 	.string "Welcome, my name is GLACIA\n"
 	.string "of the ELITE FOUR.\p"
 	.string "I've traveled from afar to HOENN\n"
@@ -70,14 +70,14 @@ EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC
 	.string "It would please me to no end if I could\n"
 	.string "go all out against you!$"
 
-EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4
+EverGrandeCity_GlaciasRoom_Text_Defeat: @ 82285B4
 	.string "You and your POKéMON…\n"
 	.string "How hot your spirits burn!\p"
 	.string "The all-consuming heat overwhelms.\p"
 	.string "It's no surprise that my icy skills\n"
 	.string "failed to harm you.$"
 
-EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640
+EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech: @ 8228640
 	.string "Advance to the next room.\p"
 	.string "And there, confirm the truly fearsome\n"
 	.string "side of the POKéMON LEAGUE.$"

data/maps/EverGrandeCity_HallOfFame/scripts.inc

@@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
 	waitmovement 0
-	applymovement 1, Common_Movement_WalkInPlaceRight
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
 	closemessage
@@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
 	waitmovement 0
 	delay 20
-	applymovement 1, Common_Movement_WalkInPlaceRight
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Common_Movement_WalkInPlaceUp
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
 	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD

data/maps/EverGrandeCity_PhoebesRoom/map.json

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

data/maps/EverGrandeCity_PhoebesRoom/scripts.inc

@@ -1,65 +1,65 @@
 EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame
 	.byte 0
 
-EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E
+EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
+EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193
-	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
+EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193
+	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
+EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 822819D
 	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
 
-EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
-	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
+EverGrandeCity_PhoebesRoom_OnLoad: @ 82281AA
+	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 2
-	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
+	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF
-	call EverGrandeCity_PhoebesRoom_EventScript_2724BC
+EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82281BF
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5
-	call EverGrandeCity_PhoebesRoom_EventScript_27255F
+EverGrandeCity_PhoebesRoom_EventScript_CloseDoor:: @ 82281C5
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB
+EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2
+	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325
-	goto EverGrandeCity_PhoebesRoom_EventScript_2281FC
+	msgbox EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat
+	goto EverGrandeCity_PhoebesRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2
-	msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT
+EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech:: @ 82281F2
+	msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC
+EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC
 	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_2723F8
-	msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E
+EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech: @ 822820E
 	.string "Ahahaha!\p"
 	.string "I'm PHOEBE of the ELITE FOUR.\n"
 	.string "I did my training on MT. PYRE.\p"
@@ -70,11 +70,11 @@ EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E
 	.string "So, come on, just try and see if you can\n"
 	.string "even inflict damage on my POKéMON!$"
 
-EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325
+EverGrandeCity_PhoebesRoom_Text_Defeat: @ 8228325
 	.string "Oh, darn.\n"
 	.string "I've gone and lost.$"
 
-EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343
+EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech: @ 8228343
 	.string "There's a definite bond between you\n"
 	.string "and your POKéMON, too.\p"
 	.string "I didn't recognize it, so it's only\n"

data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F

data/maps/EverGrandeCity_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc

@@ -1,20 +1,21 @@
 EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8229CF5
+	call CableClub_EventScript_Colosseum
 	end
 
-EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8229CFB
+	call CableClub_EventScript_TradeCenter
 	end
 
-EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8229D01
+	call CableClub_EventScript_RecordCorner
 	end
 
 

data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc

@@ -1,6 +1,6 @@
 EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD

data/maps/EverGrandeCity_PokemonLeague_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc

@@ -1,19 +1,20 @@
 EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum:: @ 8229D1C
+	call CableClub_EventScript_Colosseum
 	end
 
-EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter:: @ 8229D22
+	call CableClub_EventScript_TradeCenter
 	end
 
-EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner:: @ 8229D28
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/EverGrandeCity_SidneysRoom/map.json

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

data/maps/EverGrandeCity_SidneysRoom/scripts.inc

@@ -1,8 +1,8 @@
 EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame
 	.byte 0
 
 EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
@@ -10,63 +10,62 @@ EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	end
 
-EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
-	call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
+EverGrandeCity_SidneysRoom_OnLoad: @ 8227F1D
+	call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 1
-	call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
+	call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32
-	call EverGrandeCity_SidneysRoom_EventScript_2724BC
+EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom:: @ 8227F32
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38
-	call EverGrandeCity_SidneysRoom_EventScript_27255F
+EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 8227F38
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E
-EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48
+EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
+EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D
-	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
+EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D
+	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
+EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor:: @ 8227F57
 	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
+EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
+	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
-	goto EverGrandeCity_SidneysRoom_EventScript_227F95
+	msgbox EverGrandeCity_SidneysRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat
+	goto EverGrandeCity_SidneysRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B
-	msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
+EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech:: @ 8227F8B
+	msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95
+EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95
 	setflag FLAG_DEFEATED_ELITE_4_SIDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_2723F8
-	msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7
+EverGrandeCity_SidneysRoom_Text_PreBattleSpeech: @ 8227FA7
 	.string "Welcome, challenger!\n"
 	.string "I'm SIDNEY of the ELITE FOUR.\p"
 	.string "I like that look you're giving me.\n"
@@ -76,11 +75,11 @@ EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7
 	.string "a battle that can only be staged\l"
 	.string "here in the POKéMON LEAGUE!$"
 
-EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2
+EverGrandeCity_SidneysRoom_Text_Defeat: @ 82280A2
 	.string "Well, how do you like that? I lost!\n"
 	.string "Eh, it was fun, so it doesn't matter.$"
 
-EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC
+EverGrandeCity_SidneysRoom_Text_PostBattleSpeech: @ 82280EC
 	.string "Well, listen to what this loser has\n"
 	.string "to say.\p"
 	.string "You've got what it takes to go far.\n"

data/maps/FallarborTown_Mart/map.json

@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_2C80B6",
+      "script": "FallarborTown_Mart_EventScript_MetronomeTutor",
       "flag": "0"
     }
   ],

data/maps/FallarborTown_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8

data/maps/FallarborTown_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/FallarborTown_PokemonCenter_2F/scripts.inc

@@ -1,19 +1,20 @@
 FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00
+	call CableClub_EventScript_Colosseum
 	end
 
-FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06
+	call CableClub_EventScript_TradeCenter
 	end
 
-FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/FarawayIsland_Entrance/scripts.inc

@@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
 	goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
 	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE

data/maps/FortreeCity/scripts.inc

@@ -8,7 +8,7 @@ FortreeCity_OnTransition: @ 81E25AF
 	end
 
 FortreeCity_MapScript1_1E25B3: @ 81E25B3
-	setstepcallback 2
+	setstepcallback STEP_CB_FORTREE_BRIDGE
 	end
 
 FortreeCity_EventScript_1E25B6:: @ 81E25B6
@@ -72,7 +72,7 @@ FortreeCity_EventScript_1E2630:: @ 81E2630
 FortreeCity_EventScript_1E2645:: @ 81E2645
 	msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7
+	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KECLEON, 2

data/maps/FortreeCity_Gym/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Gym_EventScript_2165C8",
+      "script": "FortreeCity_Gym_EventScript_Winona",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "FortreeCity_Gym_EventScript_2166A8",
+      "script": "FortreeCity_Gym_EventScript_Jared",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "FortreeCity_Gym_EventScript_2166D6",
+      "script": "FortreeCity_Gym_EventScript_Flint",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "FortreeCity_Gym_EventScript_2166ED",
+      "script": "FortreeCity_Gym_EventScript_Ashley",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "FortreeCity_Gym_EventScript_2166BF",
+      "script": "FortreeCity_Gym_EventScript_Edwardo",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Gym_EventScript_216732",
+      "script": "FortreeCity_Gym_EventScript_GymGuide",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "FortreeCity_Gym_EventScript_216704",
+      "script": "FortreeCity_Gym_EventScript_Humberto",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "FortreeCity_Gym_EventScript_21671B",
+      "script": "FortreeCity_Gym_EventScript_Darius",
       "flag": "0"
     }
   ],
@@ -143,7 +143,7 @@
       "y": 21,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_Gym_EventScript_216751"
+      "script": "FortreeCity_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -151,7 +151,7 @@
       "y": 21,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_Gym_EventScript_216761"
+      "script": "FortreeCity_Gym_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/FortreeCity_Gym/scripts.inc

@@ -1,44 +1,44 @@
 FortreeCity_Gym_MapScripts:: @ 82165AB
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_OnWarp
 	.byte 0
 
 FortreeCity_Gym_OnTransition: @ 82165B6
 	special RotatingGate_InitPuzzle
 	end
 
-FortreeCity_Gym_MapScript2_2165BA: @ 82165BA
-	map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4
+FortreeCity_Gym_OnWarp: @ 82165BA
+	map_script_2 VAR_TEMP_0, VAR_TEMP_0, FortreeCity_Gym_EventScript_InitRotatingGates
 	.2byte 0
 
-FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
+FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4
 	special RotatingGate_InitPuzzleAndGraphics
 	end
 
-FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
-	trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC
+FortreeCity_Gym_EventScript_Winona:: @ 82165C8
+	trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq FortreeCity_Gym_EventScript_21668D
-	goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646
-	msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch
+	goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2
+	msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
-	message FortreeCity_Gym_Text_216EEC
+FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
+	message FortreeCity_Gym_Text_ReceivedFeatherBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
+	msgbox FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
 	setvar VAR_0x8008, 6
 	call Common_EventScript_SetGymTrainers
-	call FortreeCity_Gym_EventScript_21666A
+	call FortreeCity_Gym_EventScript_GiveAerialAce
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT
+	msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -48,94 +48,94 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	release
 	end
 
-FortreeCity_Gym_EventScript_216646:: @ 8216646
+FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
 	giveitem_std ITEM_TM40
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
+	msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	release
 	end
 
-FortreeCity_Gym_EventScript_21666A:: @ 821666A
+FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
 	giveitem_std ITEM_TM40
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
-	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
+	msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	return
 
-FortreeCity_Gym_EventScript_21668D:: @ 821668D
-	trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292
-	msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D
+	trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreRematch, FortreeCity_Gym_Text_WinonaRematchDefeat, FortreeCity_Gym_Text_WinonaRematchNeedTwoMons
+	msgbox FortreeCity_Gym_Text_WinonaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_2166A8:: @ 82166A8
-	trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3
-	msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_Jared:: @ 82166A8
+	trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat
+	msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_2166BF:: @ 82166BF
-	trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7
-	msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF
+	trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat
+	msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_2166D6:: @ 82166D6
-	trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4
-	msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_Flint:: @ 82166D6
+	trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat
+	msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_2166ED:: @ 82166ED
-	trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51
-	msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_Ashley:: @ 82166ED
+	trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat
+	msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_216704:: @ 8216704
-	trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18
-	msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_Humberto:: @ 8216704
+	trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat
+	msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_21671B:: @ 821671B
-	trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2
-	msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE
+FortreeCity_Gym_EventScript_Darius:: @ 821671B
+	trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat
+	msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_216732:: @ 8216732
+FortreeCity_Gym_EventScript_GymGuide:: @ 8216732
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747
-	msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory
+	msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_Gym_EventScript_216747:: @ 8216747
-	msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT
+FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8216747
+	msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_Gym_EventScript_216751:: @ 8216751
+FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8216751
 	lockall
-	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771
-	goto FortreeCity_Gym_EventScript_21677B
+	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
+	goto FortreeCity_Gym_EventScript_GymStatue
 	end
 
-FortreeCity_Gym_EventScript_216761:: @ 8216761
+FortreeCity_Gym_EventScript_RightGymStatue:: @ 8216761
 	lockall
-	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771
-	goto FortreeCity_Gym_EventScript_21677B
+	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
+	goto FortreeCity_Gym_EventScript_GymStatue
 	end
 
-FortreeCity_Gym_EventScript_216771:: @ 8216771
-	msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT
+FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8216771
+	msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_Gym_EventScript_21677B:: @ 821677B
-	msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT
+FortreeCity_Gym_EventScript_GymStatue:: @ 821677B
+	msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_Gym_Text_216785: @ 8216785
+FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785
 	.string "Yo, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "FORTREE GYM LEADER WINONA is\n"
@@ -146,94 +146,94 @@ FortreeCity_Gym_Text_216785: @ 8216785
 	.string "who are trying to take wing!\p"
 	.string "Okay, go for it!$"
 
-FortreeCity_Gym_Text_21687D: @ 821687D
+FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D
 	.string "You did it!\n"
 	.string "You've achieved liftoff!$"
 
-FortreeCity_Gym_Text_2168A2: @ 82168A2
+FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2
 	.string "Behold the elegant battle style of\n"
 	.string "BIRD POKéMON!$"
 
-FortreeCity_Gym_Text_2168D3: @ 82168D3
+FortreeCity_Gym_Text_JaredDefeat: @ 82168D3
 	.string "You…\n"
 	.string "You're strong…$"
 
-FortreeCity_Gym_Text_2168E7: @ 82168E7
+FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7
 	.string "A TRAINER has to be smart to keep\n"
 	.string "up with unexpected turns of events.\p"
 	.string "Do you have the smarts to get to\n"
 	.string "our LEADER?$"
 
-FortreeCity_Gym_Text_21695A: @ 821695A
+FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A
 	.string "The lovers of BIRD POKéMON aspire\n"
 	.string "to join this GYM.\p"
 	.string "As a member of the FORTREE GYM,\n"
 	.string "I'm not allowed to lose!$"
 
-FortreeCity_Gym_Text_2169C7: @ 82169C7
+FortreeCity_Gym_Text_EdwardoDefeat: @ 82169C7
 	.string "It was too much of a load for me\n"
 	.string "to bear…$"
 
-FortreeCity_Gym_Text_2169F1: @ 82169F1
+FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1
 	.string "The world is huge, and there are\n"
 	.string "countless tough TRAINERS.\p"
 	.string "I'm going to keep training and make\n"
 	.string "myself even stronger.$"
 
-FortreeCity_Gym_Text_216A66: @ 8216A66
+FortreeCity_Gym_Text_FlintPreBattle: @ 8216A66
 	.string "There's no need for WINONA, our GYM\n"
 	.string "LEADER, to deal with you!\p"
 	.string "I'm plenty good enough for you!$"
 
-FortreeCity_Gym_Text_216AC4: @ 8216AC4
+FortreeCity_Gym_Text_FlintDefeat: @ 8216AC4
 	.string "WINONA, I…\n"
 	.string "I lost!$"
 
-FortreeCity_Gym_Text_216AD7: @ 8216AD7
+FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7
 	.string "WINONA is cute and she's strong.\n"
 	.string "She's the ultimate LEADER!\p"
 	.string "Blush…$"
 
-FortreeCity_Gym_Text_216B1A: @ 8216B1A
+FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A
 	.string "WINONA taught me personally!\n"
 	.string "You can't beat me easily!$"
 
-FortreeCity_Gym_Text_216B51: @ 8216B51
+FortreeCity_Gym_Text_AshleyDefeat: @ 8216B51
 	.string "I was beaten…$"
 
-FortreeCity_Gym_Text_216B5F: @ 8216B5F
+FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F
 	.string "Thanks to WINONA, the people of\n"
 	.string "FORTREE can live without fear.$"
 
-FortreeCity_Gym_Text_216B9E: @ 8216B9E
+FortreeCity_Gym_Text_HumbertoPreBattle: @ 8216B9E
 	.string "When WINONA takes to battle, her face\n"
 	.string "shines with beautiful determination…\p"
 	.string "I'm not letting you witness that\n"
 	.string "lovely sight!$"
 
-FortreeCity_Gym_Text_216C18: @ 8216C18
+FortreeCity_Gym_Text_HumbertoDefeat: @ 8216C18
 	.string "Urk!\n"
 	.string "I couldn't stop you.$"
 
-FortreeCity_Gym_Text_216C32: @ 8216C32
+FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32
 	.string "You'd better watch it!\n"
 	.string "Don't get distracted staring at WINONA\l"
 	.string "or you'll go crashing down in a heap!$"
 
-FortreeCity_Gym_Text_216C96: @ 8216C96
+FortreeCity_Gym_Text_DariusPreBattle: @ 8216C96
 	.string "You'd better know that there are all\n"
 	.string "sorts of FLYING-type POKéMON.\p"
 	.string "You do know that, right?$"
 
-FortreeCity_Gym_Text_216CF2: @ 8216CF2
+FortreeCity_Gym_Text_DariusDefeat: @ 8216CF2
 	.string "You seem to know your stuff!$"
 
-FortreeCity_Gym_Text_216D0F: @ 8216D0F
+FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F
 	.string "Sure, you beat me all right.\n"
 	.string "But you'd better watch it! Our LEADER\l"
 	.string "WINONA's POKéMON are all business.$"
 
-FortreeCity_Gym_Text_216D75: @ 8216D75
+FortreeCity_Gym_Text_WinonaPreBattle: @ 8216D75
 	.string "I am WINONA. I am the LEADER of\n"
 	.string "the FORTREE POKéMON GYM.\p"
 	.string "I have become one with BIRD POKéMON\n"
@@ -243,18 +243,18 @@ FortreeCity_Gym_Text_216D75: @ 8216D75
 	.string "Witness the elegant choreography\n"
 	.string "of BIRD POKéMON and I!$"
 
-FortreeCity_Gym_Text_216E60: @ 8216E60
+FortreeCity_Gym_Text_WinonaDefeat: @ 8216E60
 	.string "Never before have I seen a TRAINER\n"
 	.string "command POKéMON with more grace\l"
 	.string "than I…\p"
 	.string "In recognition of your prowess,\n"
 	.string "I present to you this GYM BADGE.$"
 
-FortreeCity_Gym_Text_216EEC: @ 8216EEC
+FortreeCity_Gym_Text_ReceivedFeatherBadge: @ 8216EEC
 	.string "{PLAYER} received the FEATHER BADGE\n"
 	.string "from WINONA.$"
 
-FortreeCity_Gym_Text_216F17: @ 8216F17
+FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17
 	.string "With the FEATHER BADGE, all POKéMON up\n"
 	.string "to LV 70, even those received through\l"
 	.string "trades, will obey your every command.\p"
@@ -263,29 +263,29 @@ FortreeCity_Gym_Text_216F17: @ 8216F17
 	.string "And this…\n"
 	.string "This is a gift from me.$"
 
-FortreeCity_Gym_Text_216FEC: @ 8216FEC
+FortreeCity_Gym_Text_ExplainAerialAce: @ 8216FEC
 	.string "TM40 contains AERIAL ACE.\p"
 	.string "Its speed…\n"
 	.string "No POKéMON should be able to avoid it.\p"
 	.string "… … … … … …$"
 
-FortreeCity_Gym_Text_217044: @ 8217044
+FortreeCity_Gym_Text_RegisteredWinona: @ 8217044
 	.string "Registered GYM LEADER WINONA\n"
 	.string "in the POKéNAV.$"
 
-FortreeCity_Gym_Text_217071: @ 8217071
+FortreeCity_Gym_Text_WinonaPostBattle: @ 8217071
 	.string "Though I fell to you, I will remain\n"
 	.string "devoted to BIRD POKéMON.$"
 
-FortreeCity_Gym_Text_2170AE: @ 82170AE
+FortreeCity_Gym_Text_GymStatue: @ 82170AE
 	.string "FORTREE CITY POKéMON GYM$"
 
-FortreeCity_Gym_Text_2170C7: @ 82170C7
+FortreeCity_Gym_Text_GymStatueCertified: @ 82170C7
 	.string "FORTREE CITY POKéMON GYM\p"
 	.string "WINONA'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-FortreeCity_Gym_Text_217100: @ 8217100
+FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100
 	.string "WINONA: We humans can never escape\n"
 	.string "gravity's pull on the ground.\p"
 	.string "But by striving for excellence,\n"
@@ -295,17 +295,17 @@ FortreeCity_Gym_Text_217100: @ 8217100
 	.string "Please, allow me to see your power\n"
 	.string "at full flight!$"
 
-FortreeCity_Gym_Text_2171E6: @ 82171E6
+FortreeCity_Gym_Text_WinonaRematchDefeat: @ 82171E6
 	.string "I failed to reach your height again…$"
 
-FortreeCity_Gym_Text_21720B: @ 821720B
+FortreeCity_Gym_Text_WinonaPostRematch: @ 821720B
 	.string "WINONA: Even though I have lost,\n"
 	.string "the wings of my heart remain unbroken.\p"
 	.string "I can rise and soar again and\n"
 	.string "yet again.\p"
 	.string "I am convinced of it!$"
 
-FortreeCity_Gym_Text_217292: @ 8217292
+FortreeCity_Gym_Text_WinonaRematchNeedTwoMons: @ 8217292
 	.string "WINONA: We humans can never escape\n"
 	.string "gravity's pull on the ground.\p"
 	.string "But by striving for excellence,\n"

data/maps/FortreeCity_House1/scripts.inc

@@ -5,7 +5,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
 	lock
 	faceplayer
 	goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
-	setvar VAR_0x8008, 1
+	setvar VAR_0x8008, INGAME_TRADE_PLUSLE
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT

data/maps/FortreeCity_House2/map.json

@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House2_EventScript_2C811E",
+      "script": "FortreeCity_House2_EventScript_SleepTalkTutor",
       "flag": "0"
     }
   ],

data/maps/FortreeCity_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3

data/maps/FortreeCity_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/FortreeCity_PokemonCenter_2F/scripts.inc

@@ -1,19 +1,20 @@
 FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653
+	call CableClub_EventScript_Colosseum
 	end
 
-FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659
+	call CableClub_EventScript_TradeCenter
 	end
 
-FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/GraniteCave_B1F/scripts.inc

@@ -1,11 +1,11 @@
 GraniteCave_B1F_MapScripts:: @ 822DC5E
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327
-	map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331
-	map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
+	map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp
 	.byte 0
 
-GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E
-	setstepcallback 7
+GraniteCave_B1F_SetHoleWarp: @ 822DC6E
+	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
 	end
 

data/maps/InsideOfTruck/scripts.inc

@@ -10,7 +10,7 @@ InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
 	end
 
 InsideOfTruck_MapScript1_23BF01: @ 823BF01
-	setstepcallback 5
+	setstepcallback STEP_CB_TRUCK
 	end
 
 InsideOfTruck_EventScript_23BF04:: @ 823BF04

data/maps/JaggedPass/scripts.inc

@@ -5,7 +5,7 @@ JaggedPass_MapScripts:: @ 8230656
 	.byte 0
 
 JaggedPass_MapScript1_230666: @ 8230666
-	setstepcallback 1
+	setstepcallback STEP_CB_ASH
 	compare VAR_JAGGED_PASS_STATE, 0
 	call_if_eq JaggedPass_EventScript_230674
 	end

data/maps/LavaridgeTown/scripts.inc

@@ -110,7 +110,7 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635
 	return
 
 LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
-	applymovement 8, Common_Movement_WalkInPlaceUp
+	applymovement 8, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
 	applymovement 8, Common_Movement_ExclamationMark
@@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
 	waitmovement 0
 	closedoor 12, 15
 	waitdooranim
-	applymovement 8, Common_Movement_WalkInPlaceLeft
+	applymovement 8, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
 	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 

data/maps/LavaridgeTown_Gym_1F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Flannery",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Cole",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE900",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Gerald",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Axle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Danielle",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C",
+      "script": "LavaridgeTown_Gym_1F_EventScript_GymGuide",
       "flag": "0"
     }
   ],
@@ -285,7 +285,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B"
+      "script": "LavaridgeTown_Gym_1F_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -293,7 +293,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B"
+      "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/LavaridgeTown_Gym_1F/scripts.inc

@@ -3,91 +3,84 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
 	.byte 0
 
 LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA
-	call LavaridgeTown_Gym_1F_EventScript_1FE705
-	call LavaridgeTown_Gym_1F_EventScript_1FE757
+	call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
+	call LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705
+@ Unclear where/if these temp vars are getting checked
+LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705
 	setvar VAR_TEMP_B, 0
 	setvar VAR_TEMP_C, 0
 	setvar VAR_TEMP_D, 0
 	setvar VAR_TEMP_E, 0
 	setvar VAR_TEMP_F, 0
 	checktrainerflag TRAINER_COLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE72C
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar
 	setvar VAR_TEMP_B, 1
-
-LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C
+LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C
 	checktrainerflag TRAINER_GERALD
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE73A
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar
 	setvar VAR_TEMP_C, 1
-
-LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A
+LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A
 	checktrainerflag TRAINER_AXLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE748
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar
 	setvar VAR_TEMP_D, 1
-
-LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748
+LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748
 	checktrainerflag TRAINER_DANIELLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE756
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_E, 1
-
-LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756
+LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756
 	return
 
-LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757
+LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757
 	checktrainerflag TRAINER_COLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald
 	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764
+LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764
 	checktrainerflag TRAINER_GERALD
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle
 	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771
+LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771
 	checktrainerflag TRAINER_AXLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle
 	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E
+LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E
 	checktrainerflag TRAINER_DANIELLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers
 	setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B
+LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B
 	return
 
-LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
-	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC
+LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C
+	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreBattle, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864
-	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1FE81D
-	msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_FlanneryRematch
+	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_GiveOverheat2
+	msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
-	message LavaridgeTown_Gym_1F_Text_1FF32F
+LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
+	message LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT
 	setflag FLAG_FLANNERY_GIVES_BADGE_INFO
 	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag FLAG_BADGE04_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 4
 	call Common_EventScript_SetGymTrainers
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
 	setvar VAR_LAVARIDGE_TOWN_STATE, 1
-	call LavaridgeTown_Gym_1F_EventScript_1FE841
+	call LavaridgeTown_Gym_1F_EventScript_GiveOverheat
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_RegisteredFlannery, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -95,113 +88,112 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
+LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
+LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
-	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	return
 
-LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864
-	trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E
-	msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864
+	trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreRematch, LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat, LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons
+	msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColePreBattle, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A
-LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A
-	call LavaridgeTown_Gym_1F_EventScript_1FE705
+LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A
+	call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
 	release
 	special ShouldTryGetTrainerScript
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_GotoTrainerScript
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxlePreBattle, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganPreBattle, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DaniellePreBattle, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldPreBattle, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JacePreBattle, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffPreBattle, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliPreBattle, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C
+LavaridgeTown_Gym_1F_EventScript_GymGuide:: @ 81FE96C
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_1FE981
-	msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory
+	msgbox LavaridgeTown_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981
-	msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT
+LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory:: @ 81FE981
+	msgbox LavaridgeTown_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B
+LavaridgeTown_Gym_1F_EventScript_LeftGymStatue:: @ 81FE98B
 	lockall
-	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB
-	goto LavaridgeTown_Gym_1F_EventScript_1FE9B5
+	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified
+	goto LavaridgeTown_Gym_1F_EventScript_GymStatue
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B
+LavaridgeTown_Gym_1F_EventScript_RightGymStatue:: @ 81FE99B
 	lockall
-	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB
-	goto LavaridgeTown_Gym_1F_EventScript_1FE9B5
+	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified
+	goto LavaridgeTown_Gym_1F_EventScript_GymStatue
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB
-	msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT
+LavaridgeTown_Gym_1F_EventScript_GymStatueCertified:: @ 81FE9AB
+	msgbox LavaridgeTown_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5
-	msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT
+LavaridgeTown_Gym_1F_EventScript_GymStatue:: @ 81FE9B5
+	msgbox LavaridgeTown_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF
+LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "LAVARIDGE's GYM LEADER FLANNERY\n"
@@ -212,35 +204,35 @@ LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF
 	.string "Hose her down with water and then\l"
 	.string "go for it!$"
 
-LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8
+LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8
 	.string "Yow! That was a scorching-hot battle!$"
 
-LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE
+LavaridgeTown_Gym_1F_Text_ColePreBattle: @ 81FEADE
 	.string "Owowowowow!\n"
 	.string "Yikes, it's hot!$"
 
-LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB
+LavaridgeTown_Gym_1F_Text_ColeDefeat: @ 81FEAFB
 	.string "I'm blinded by sweat in my eyes…$"
 
-LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C
+LavaridgeTown_Gym_1F_Text_ColePostBattle: @ 81FEB1C
 	.string "Being buried in hot sand promotes\n"
 	.string "circulation.\p"
 	.string "It's effective for healing pain in\n"
 	.string "your joints.$"
 
-LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B
+LavaridgeTown_Gym_1F_Text_AxlePreBattle: @ 81FEB7B
 	.string "I'm trying to relieve my stress.\n"
 	.string "Don't come along and stress me out!$"
 
-LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0
+LavaridgeTown_Gym_1F_Text_AxleDefeat: @ 81FEBC0
 	.string "I hope FLANNERY flames you good!$"
 
-LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1
+LavaridgeTown_Gym_1F_Text_AxlePostBattle: @ 81FEBE1
 	.string "Haaah… Whew…\p"
 	.string "If you spend too much time buried in\n"
 	.string "hot sand, it tuckers you out…$"
 
-LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31
+LavaridgeTown_Gym_B1F_Text_KeeganPreBattle: @ 81FEC31
 	.string "You must be getting tired by now.\n"
 	.string "You'd like to rest in the hot sand,\l"
 	.string "wouldn't you?\p"
@@ -248,78 +240,78 @@ LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31
 	.string "your willpower is an important ability\l"
 	.string "for all TRAINERS.$"
 
-LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3
+LavaridgeTown_Gym_B1F_Text_KeeganDefeat: @ 81FECE3
 	.string "Play with fire, and be burned…$"
 
-LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02
+LavaridgeTown_Gym_B1F_Text_KeeganPostBattle: @ 81FED02
 	.string "Your skill is real…\n"
 	.string "But our LEADER FLANNERY is strong.\p"
 	.string "If you don't watch yourself, you'll be\n"
 	.string "burned seriously.$"
 
-LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72
+LavaridgeTown_Gym_1F_Text_GeraldPreBattle: @ 81FED72
 	.string "Can your POKéMON withstand\n"
 	.string "392-degree heat?$"
 
-LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E
+LavaridgeTown_Gym_1F_Text_GeraldDefeat: @ 81FED9E
 	.string "It didn't burn hotly enough…$"
 
-LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB
+LavaridgeTown_Gym_1F_Text_GeraldPostBattle: @ 81FEDBB
 	.string "The temperature of magma is\n"
 	.string "392 degrees.\p"
 	.string "Your POKéMON beat me, so they should\n"
 	.string "easily survive in magma.$"
 
-LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22
+LavaridgeTown_Gym_1F_Text_DaniellePreBattle: @ 81FEE22
 	.string "Um…\n"
 	.string "Okay, I'll battle with you.$"
 
-LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42
+LavaridgeTown_Gym_1F_Text_DanielleDefeat: @ 81FEE42
 	.string "Oh, but you're too strong.$"
 
-LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D
+LavaridgeTown_Gym_1F_Text_DaniellePostBattle: @ 81FEE5D
 	.string "I'm going to be a pretty and strong\n"
 	.string "TRAINER just like FLANNERY.$"
 
-LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D
+LavaridgeTown_Gym_B1F_Text_JacePreBattle: @ 81FEE9D
 	.string "Come on, get with it!\n"
 	.string "Let's go before my feelings cool!$"
 
-LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5
+LavaridgeTown_Gym_B1F_Text_JaceDefeat: @ 81FEED5
 	.string "It's so hot, and yet my heart is\n"
 	.string "clutched by ice…$"
 
-LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07
+LavaridgeTown_Gym_B1F_Text_JacePostBattle: @ 81FEF07
 	.string "The way the battling spirit burns\n"
 	.string "within you, you may stand a chance\l"
 	.string "against our LEADER.$"
 
-LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60
+LavaridgeTown_Gym_B1F_Text_JeffPreBattle: @ 81FEF60
 	.string "See how the flames blaze wildly?\n"
 	.string "They flare in anticipation of my win!$"
 
-LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7
+LavaridgeTown_Gym_B1F_Text_JeffDefeat: @ 81FEFA7
 	.string "Something didn't go right.$"
 
-LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2
+LavaridgeTown_Gym_B1F_Text_JeffPostBattle: @ 81FEFC2
 	.string "Well, so what? I say so what?\n"
 	.string "I can walk on hot coals barefoot!\p"
 	.string "…Don't even think about trying it!$"
 
-LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025
+LavaridgeTown_Gym_B1F_Text_EliPreBattle: @ 81FF025
 	.string "As much as I love mountains,\n"
 	.string "I especially love volcanoes.$"
 
-LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F
+LavaridgeTown_Gym_B1F_Text_EliDefeat: @ 81FF05F
 	.string "Well, it seems to me I lost without\n"
 	.string "ever being in control.$"
 
-LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A
+LavaridgeTown_Gym_B1F_Text_EliPostBattle: @ 81FF09A
 	.string "I stay here because I became a fan\n"
 	.string "of FLANNERY's power.\p"
 	.string "Hehehehe.$"
 
-LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC
+LavaridgeTown_Gym_1F_Text_FlanneryPreBattle: @ 81FF0DC
 	.string "Welcome… No, wait.\p"
 	.string "Puny TRAINER, how good to see you've\n"
 	.string "made it here!\p"
@@ -334,7 +326,7 @@ LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC
 	.string "father, I shall, uh…demonstrate the\l"
 	.string "hot moves we have honed on this land!$"
 
-LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233
+LavaridgeTown_Gym_1F_Text_FlanneryDefeat: @ 81FF233
 	.string "Oh…\n"
 	.string "I guess I was trying too hard…\p"
 	.string "I… I've only recently become\n"
@@ -346,11 +338,11 @@ LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233
 	.string "Thanks for teaching me that.\n"
 	.string "For that, you deserve this.$"
 
-LavaridgeTown_Gym_1F_Text_1FF32F: @ 81FF32F
+LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge: @ 81FF32F
 	.string "{PLAYER} received the HEAT BADGE\n"
 	.string "from FLANNERY.$"
 
-LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359
+LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis: @ 81FF359
 	.string "If you have a HEAT BADGE, all POKéMON\n"
 	.string "up to Level 50, even those you get in\l"
 	.string "trades from other people, will obey\l"
@@ -360,7 +352,7 @@ LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359
 	.string "This is a token of my appreciation.\n"
 	.string "Don't be shy about taking it!$"
 
-LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C
+LavaridgeTown_Gym_1F_Text_ExplainOverheat: @ 81FF45C
 	.string "That TM50 contains OVERHEAT.\p"
 	.string "That move inflicts serious damage on\n"
 	.string "the opponent.\p"
@@ -368,24 +360,24 @@ LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C
 	.string "of the POKéMON using it. It might not\l"
 	.string "be suitable for longer battles.$"
 
-LavaridgeTown_Gym_1F_Text_1FF517: @ 81FF517
+LavaridgeTown_Gym_1F_Text_RegisteredFlannery: @ 81FF517
 	.string "Registered GYM LEADER FLANNERY\n"
 	.string "in the POKéNAV.$"
 
-LavaridgeTown_Gym_1F_Text_1FF546: @ 81FF546
+LavaridgeTown_Gym_1F_Text_FlanneryPostBattle: @ 81FF546
 	.string "Your power reminds me of someone…\p"
 	.string "Oh! I know! You battle like NORMAN,\n"
 	.string "the GYM LEADER of PETALBURG.$"
 
-LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9
+LavaridgeTown_Gym_1F_Text_GymStatue: @ 81FF5A9
 	.string "LAVARIDGE TOWN POKéMON GYM$"
 
-LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4
+LavaridgeTown_Gym_1F_Text_GymStatueCertified: @ 81FF5C4
 	.string "LAVARIDGE TOWN POKéMON GYM\p"
 	.string "FLANNERY'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601
+LavaridgeTown_Gym_1F_Text_FlanneryPreRematch: @ 81FF601
 	.string "FLANNERY: Losing a battle isn't going\n"
 	.string "to deflate me.\p"
 	.string "I love POKéMON.\n"
@@ -394,11 +386,11 @@ LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601
 	.string "Let's exchange superhot moves\n"
 	.string "in another battle!$"
 
-LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F
+LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat: @ 81FF69F
 	.string "Whew!\n"
 	.string "On the verge of eruption!$"
 
-LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF
+LavaridgeTown_Gym_1F_Text_FlanneryPostRematch: @ 81FF6BF
 	.string "FLANNERY: I lost the match,\n"
 	.string "but I'm completely satisfied.\p"
 	.string "It's not often I get to enjoy a battle\n"
@@ -406,7 +398,7 @@ LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF
 	.string "Let's have another one like this\n"
 	.string "again sometime!$"
 
-LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E
+LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons: @ 81FF75E
 	.string "FLANNERY: Losing a battle isn't going\n"
 	.string "to deflate me.\p"
 	.string "I love POKéMON.\n"

data/maps/LavaridgeTown_Gym_B1F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Jace",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Keegan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Jeff",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Eli",
       "flag": "0"
     }
   ],

data/maps/LavaridgeTown_Gym_B1F/scripts.inc

@@ -3,57 +3,50 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E
 	.byte 0
 
 LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884
-	call LavaridgeTown_Gym_B1F_EventScript_1FF88F
-	call LavaridgeTown_Gym_B1F_EventScript_1FF8DC
+	call LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars
+	call LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F
+@ Unclear where/if these temp vars are getting checked
+LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F
 	setvar VAR_TEMP_7, 0
 	setvar VAR_TEMP_8, 0
 	setvar VAR_TEMP_9, 0
 	setvar VAR_TEMP_A, 0
 	checktrainerflag TRAINER_KEEGAN
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
 	setvar VAR_TEMP_7, 1
-
-LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1
+LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1
 	checktrainerflag TRAINER_JACE
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
 	setvar VAR_TEMP_8, 1
-
-LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF
+LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF
 	checktrainerflag TRAINER_JEFF
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
 	setvar VAR_TEMP_9, 1
-
-LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD
+LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD
 	checktrainerflag TRAINER_ELI
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_A, 1
-
-LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB
+LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB
 	return
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC
+LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC
 	checktrainerflag TRAINER_KEEGAN
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
 	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9
+LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9
 	checktrainerflag TRAINER_JACE
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
 	setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6
+LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6
 	checktrainerflag TRAINER_JEFF
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
 	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903
+LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903
 	checktrainerflag TRAINER_ELI
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
 	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
-
-LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910
+LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910
 	return
 

data/maps/LavaridgeTown_House/map.json

@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_House_EventScript_2C804E",
+      "script": "LavaridgeTown_House_EventScript_MimicTutor",
       "flag": "0"
     }
   ],

data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05

data/maps/LavaridgeTown_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc

@@ -1,19 +1,20 @@
 LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FFCAC
+	call CableClub_EventScript_Colosseum
 	end
 
-LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FFCB2
+	call CableClub_EventScript_TradeCenter
 	end
 
-LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FFCB8
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/LilycoveCity/scripts.inc

@@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
 
 LilycoveCity_EventScript_1E3006:: @ 81E3006
 	closemessage
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -9,7 +9,7 @@ LilycoveCity_ContestLobby_OnTransition: @ 821A21C
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
-	getpricereduction 4
+	getpricereduction POKENEWS_BLENDMASTER
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
@@ -810,7 +810,7 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
 
 LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
+	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	release
 	end
 
@@ -908,12 +908,12 @@ LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
 	end
 
 LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
-	special BerryBlenderLinkBecomeLeader
+	special TryBecomeLinkLeader
 	waitstate
 	return
 
 LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
-	special BerryBlenderLinkJoinGroup
+	special TryJoinLinkGroup
 	waitstate
 	return
 

data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc

@@ -44,7 +44,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT
 	closemessage

data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc

@@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	special CloseDeptStoreElevatorWindow
 	closemessage
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	waitse
 	special MoveElevator

data/maps/LilycoveCity_DepartmentStoreRooftop/map.json

@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor",
       "flag": "0"
     }
   ],

data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc

@@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
 	.byte 0
 
 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
-	getpricereduction 3
+	getpricereduction POKENEWS_LILYCOVE
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
 	compare VAR_RESULT, 0
@@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
 LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268
 	lock
 	faceplayer
-	getpricereduction 3
+	getpricereduction POKENEWS_LILYCOVE
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT

data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc

@@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	copyvar VAR_0x8008, VAR_RESULT
 	special BufferLottoTicketNumber
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT
-	applymovement 2, Common_Movement_WalkInPlaceRight
+	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PC_ON
 	special DoLotteryCornerComputerEffect

data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

@@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C
 LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7
 	msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, Common_Movement_WalkInPlaceUp
+	applymovement 7, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -247,7 +247,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350
 	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
 	msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Common_Movement_WalkInPlaceUp
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
 	applymovement 4, Common_Movement_ExclamationMark
@@ -329,12 +329,12 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D
 LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Common_Movement_WalkInPlaceUp
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	removeobject 4
 	delay 30
-	applymovement 1, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	showobjectat 1, MAP_LILYCOVE_CITY_HARBOR
 	delay 30
@@ -343,7 +343,7 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
 	end
 
 LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -355,7 +355,7 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
 	return
 
 LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
-	applymovement 4, Common_Movement_WalkInPlaceUp
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	removeobject 4
@@ -419,7 +419,7 @@ LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0
 LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
 	msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -499,22 +499,22 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671
 	step_end
 
 LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675
-	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680
-	applymovement 5, Common_Movement_WalkInPlaceDown
+	applymovement 5, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B
-	applymovement 5, Common_Movement_WalkInPlaceDown
+	applymovement 5, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696
-	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 

data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,6 @@
 LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD

data/maps/LilycoveCity_PokemonCenter_2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     }
   ],

data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc

@@ -1,19 +1,20 @@
 LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
 	.byte 0
 
-LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+LilycoveCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821C772
+	call CableClub_EventScript_Colosseum
 	end
 
-LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 821C778
+	call CableClub_EventScript_TradeCenter
 	end
 
-LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821C77E
+	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc

@@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
 	lockall
-	applymovement 1, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
 	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
 	waitmovement 0

data/maps/LittlerootTown/scripts.inc

@@ -357,9 +357,9 @@ LittlerootTown_Movement_1E8118: @ 81E8118
 
 LittlerootTown_EventScript_1E811F:: @ 81E811F
 	lockall
-	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
@@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C
 	return
 
 LittlerootTown_EventScript_1E8297:: @ 81E8297
-	applymovement 4, Common_Movement_WalkInPlaceRight
+	applymovement 4, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E82A2:: @ 81E82A2
-	applymovement 4, Common_Movement_WalkInPlaceLeft
+	applymovement 4, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0
 	return
 
 LittlerootTown_EventScript_1E8333:: @ 81E8333
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85D1
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8348:: @ 81E8348
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85D8
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E835D:: @ 81E835D
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85DF
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8372:: @ 81E8372
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85E4
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8387:: @ 81E8387
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85EA
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E839C:: @ 81E839C
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85ED
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83B1:: @ 81E83B1
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F1
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83C6:: @ 81E83C6
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F5
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83DB:: @ 81E83DB
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F8
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83F0:: @ 81E83F0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85FE
 	waitmovement 0
@@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
 	compare VAR_RESULT, FEMALE
 	call_if_eq LittlerootTown_EventScript_1E828C
 	call LittlerootTown_EventScript_1E8693
-	applymovement 4, Common_Movement_WalkInPlaceUp
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -94,7 +94,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
 	waitmovement 0
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
 	waitmovement 0
 	special GetRivalSonDaughterString
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 0
-	applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	goto LittlerootTown_BrendansHouse_1F_EventScript_292765
 	end
@@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 

data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc

@@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage

data/maps/LittlerootTown_MaysHouse_1F/scripts.inc

@@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
 	waitmovement 0
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
 	waitmovement 0
 	special GetRivalSonDaughterString
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto LittlerootTown_MaysHouse_1F_EventScript_292765
 	end
@@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 

data/maps/LittlerootTown_MaysHouse_2F/scripts.inc

@@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
 LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
 
 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
 	call Common_EventScript_SetupRivalGfxId
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
@@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	delay 10
 	playse SE_TK_KASYA
 	delay 20
-	applymovement 3, Common_Movement_WalkInPlaceRight
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 3, Common_Movement_WalkInPlaceFastestRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	delay 20
 	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
 	waitmovement 0
-	applymovement 3, Common_Movement_WalkInPlaceUp
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement 3, Common_Movement_WalkInPlaceFastestUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
@@ -286,9 +286,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, Common_Movement_WalkInPlaceRight
+	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	drawmonpic SPECIES_CYNDAQUIL, 10, 3
+	showmonpic SPECIES_CYNDAQUIL, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -299,9 +299,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, Common_Movement_WalkInPlaceRight
+	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	drawmonpic SPECIES_TOTODILE, 10, 3
+	showmonpic SPECIES_TOTODILE, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -312,9 +312,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, Common_Movement_WalkInPlaceRight
+	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	drawmonpic SPECIES_CHIKORITA, 10, 3
+	showmonpic SPECIES_CHIKORITA, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -327,7 +327,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
-	erasemonpic
+	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -340,7 +340,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
-	erasemonpic
+	hidemonpic
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
@@ -371,7 +371,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
-	erasemonpic
+	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
@@ -385,7 +385,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
-	erasemonpic
+	hidemonpic
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
@@ -416,7 +416,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
-	erasemonpic
+	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
@@ -430,7 +430,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
-	erasemonpic
+	hidemonpic
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
@@ -461,7 +461,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
-	erasemonpic
+	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
 	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	end
 
@@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
-	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2
-Route101_EventScript_1FA2D2:: @ 81FA2D2
+EventScript_RegisterProfBirch:: @ 81FA2D2
 	msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -530,7 +529,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
 	closemessage
 	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE

data/maps/MagmaHideout_4F/scripts.inc

@@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
 	special sub_80B0534
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 150
 	removeobject 7
@@ -50,7 +50,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
 	applymovement 6, Common_Movement_FacePlayer

data/maps/MauvilleCity/map.json

@@ -162,7 +162,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_2C7F7E",
+      "script": "MauvilleCity_EventScript_RolloutTutor",
       "flag": "0"
     },
     {

data/maps/MauvilleCity/scripts.inc

@@ -86,7 +86,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D
 MauvilleCity_EventScript_1DF452:: @ 81DF452
 	lockall
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
-	applymovement 6, Common_Movement_WalkInPlaceRight
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
 	msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
@@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
 	applymovement 6, MauvilleCity_Movement_1DF6A8
 	applymovement 7, MauvilleCity_Movement_1DF6E2
 	waitmovement 0
-	applymovement 6, Common_Movement_WalkInPlaceRight
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
 	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
@@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D
 	applymovement 6, MauvilleCity_Movement_1DF6AE
 	applymovement 7, MauvilleCity_Movement_1DF6E8
 	waitmovement 0
-	applymovement 6, Common_Movement_WalkInPlaceRight
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
 	applymovement 7, MauvilleCity_Movement_1DF6F7
@@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
 	call_if_eq MauvilleCity_EventScript_1DF5F3
 	compare VAR_FACING, DIR_EAST
 	call_if_eq MauvilleCity_EventScript_1DF601
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
 	closemessage
@@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628
 MauvilleCity_EventScript_1DF63A:: @ 81DF63A
 	msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
-	applymovement 6, Common_Movement_WalkInPlaceRight
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
-	applymovement 6, Common_Movement_WalkInPlaceRight
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
 	return

data/maps/MauvilleCity_GameCorner/map.json

@@ -291,7 +291,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -299,7 +299,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -307,7 +307,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -315,7 +315,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -323,7 +323,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -331,7 +331,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -339,7 +339,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -347,7 +347,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -355,7 +355,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -379,7 +379,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     }
   ]
 }