Merge pull request #693 from pret/porymap-6

Update for Porymap 6

.gitignore

@@ -44,6 +44,7 @@ ld_script_ruby.txt
 ld_script_sapphire.txt
 sound/**/*.bin
 sound/songs/midi/*.s
+src/data/heal_locations.h
 src/data/items.h
 src/data/wild_encounters.h
 src/data/region_map/region_map_entries.h

Makefile

@@ -264,7 +264,8 @@ generated: $(AUTO_GEN_TARGETS)
 %.rl:     %      ; $(GFX) $< $@
 
 clean-generated:
-	-rm -f $(AUTO_GEN_TARGETS)
+	@rm -f $(AUTO_GEN_TARGETS)
+	@echo "rm -f <AUTO_GEN_TARGETS>"
 
 ifeq ($(MODERN),0)
 $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork

asm/macros/event.inc

@@ -610,10 +610,10 @@
 	.endm
 
 	@ Blocks script execution until the movements being applied to the specified (localId) object finish.
-	@ If localId is 0, then the id of the last-moved object will be used instead. If the specified object
+	@ If localId is LOCALID_NONE (0), then the id of the last-moved object will be used instead.
-	@ is not currently being manipulated with applymovement, then this command does nothing.
+	@ If the specified object is not currently being manipulated with applymovement, then this command does nothing.
 	@ If no map is specified, then the current map is used.
-	.macro waitmovement localId:req, map
+	.macro waitmovement localId=LOCALID_NONE, map
 		.ifb \map
 			.byte 0x51
 			.2byte \localId

data/maps/BirthIsland_Exterior/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BIRTH_ISLAND_EXTERIOR",
   "name": "BirthIsland_Exterior",
   "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
-  "music": "0xFFFF",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_METEORITE",
       "x": 15,
@@ -30,6 +31,7 @@
       "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
     },
     {
+      "local_id": "LOCALID_BIRTH_ISLAND_DEOXYS",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 15,

data/maps/BirthIsland_Exterior/scripts.inc

@@ -1,6 +1,3 @@
-.set LOCALID_DEOXYS_ROCK, 1
-.set LOCALID_DEOXYS,      2
-
 BirthIsland_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
@@ -38,7 +35,7 @@ BirthIsland_Exterior_OnResume::
 BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
 	specialvar VAR_RESULT, GetBattleOutcome
 	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	removeobject LOCALID_DEOXYS
+	removeobject LOCALID_BIRTH_ISLAND_DEOXYS
 	return
 
 BirthIsland_Exterior_EventScript_Triangle::
@@ -68,21 +65,21 @@ BirthIsland_Exterior_EventScript_NotSolved3::
 	end
 
 BirthIsland_Exterior_EventScript_Deoxys::
-	addobject LOCALID_DEOXYS
+	addobject LOCALID_BIRTH_ISLAND_DEOXYS
 	waitse
-	setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
+	setfieldeffectargument 0, LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK
-	setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR)
+	setfieldeffectargument 1, MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR)
-	setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR)
+	setfieldeffectargument 2, MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR)
 	dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
 	playbgm MUS_ENCOUNTER_DEOXYS, 0
 	waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
-	applymovement LOCALID_DEOXYS, Movement_DeoxysApproach
+	applymovement LOCALID_BIRTH_ISLAND_DEOXYS, Movement_DeoxysApproach
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
-	setvar VAR_LAST_TALKED, LOCALID_DEOXYS
+	setvar VAR_LAST_TALKED, LOCALID_BIRTH_ISLAND_DEOXYS
 	seteventmon SPECIES_DEOXYS, 30
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special StartLegendaryBattle

data/maps/BirthIsland_Harbor/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BIRTH_ISLAND_HARBOR",
   "name": "BirthIsland_Harbor",
   "layout": "LAYOUT_ISLAND_HARBOR",
-  "music": "0xFFFF",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/CeladonCity/map.json

@@ -41,6 +41,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
+      "local_id": "LOCALID_CELADON_FAT_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 38,
@@ -55,6 +56,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CELADON_POLIWRATH",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POLIWRATH",
       "x": 36,
@@ -153,6 +155,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CELADON_BORDER_TREE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 52,
@@ -199,7 +202,7 @@
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": -7,
       "y": 21,
-      "target_local_id": 7,
+      "target_local_id": "LOCALID_ROUTE16_CUT_TREE",
       "target_map": "MAP_ROUTE16"
     },
     {

data/maps/CeladonCity/scripts.inc

@@ -1,6 +1,3 @@
-.set LOCALID_FAT_MAN,   2
-.set LOCALID_POLIWRATH, 3
-
 CeladonCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition
 	.byte 0
@@ -36,7 +33,7 @@ CeladonCity_EventScript_FatMan::
 	faceplayer
 	msgbox CeladonCity_Text_MyTrustedPalPoliwrath
 	closemessage
-	applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_CELADON_FAT_MAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -49,7 +46,7 @@ CeladonCity_EventScript_Poliwrath::
 	msgbox CeladonCity_Text_Poliwrath
 	closemessage
 	waitmoncry
-	applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_CELADON_POLIWRATH, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/CeladonCity_Condominiums_RoofRoom/map.json

@@ -30,6 +30,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_EEVEE_POKEBALL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,

data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_EEVEE_POKEBALL, 2
-
 CeladonCity_Condominiums_RoofRoom_MapScripts::
 	.byte 0
 

data/maps/CeladonCity_GameCorner/map.json

@@ -156,6 +156,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_GAME_CORNER_GRUNT",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_GRUNT, 11
-
 CeladonCity_GameCorner_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad
 	.byte 0
@@ -246,14 +244,14 @@ CeladonCity_GameCorner_EventScript_SlotMachine::
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
 	msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
 	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
-	setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
+	setfieldeffectargument 0, LOCALID_PLAYER
 .ifdef BUGFIX
-	setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 1, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
-	setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 2, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
 .else
 	@ Map num/group were provided in the wrong order
-	setfieldeffectargument 1, MAP_GROUP(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 1, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
-	setfieldeffectargument 2, MAP_NUM(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 2, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
 .endif
 	dofieldeffect FLDEFF_SMILEY_FACE_ICON
 	waitfieldeffect FLDEFF_SMILEY_FACE_ICON
@@ -421,17 +419,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt::
 	closemessage
 	call_if_eq VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExitWest
 	call_if_ne VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExit
-	removeobject LOCALID_GRUNT
+	removeobject LOCALID_GAME_CORNER_GRUNT
 	release
 	end
 
 CeladonCity_GameCorner_Text_GruntExitWest::
-	applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
+	applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
 	waitmovement 0
 	return
 
 CeladonCity_GameCorner_Text_GruntExit::
-	applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
+	applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
 	waitmovement 0
 	return
 

data/maps/CeladonCity_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_CELADON_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/CeladonCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ CeladonCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 CeladonCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_CELADON_CITY
+	setrespawn HEAL_LOCATION_CELADON_CITY
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_Nurse::

data/maps/CeruleanCity/map.json

@@ -37,6 +37,7 @@
   ],
   "object_events": [
     {
+      "local_id": "LOCALID_CERULEAN_POLICEMAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 31,
@@ -51,6 +52,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CERULEAN_GRUNT",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 33,
@@ -93,6 +95,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CERULEAN_SLOWBRO",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SLOWBRO",
       "x": 32,
@@ -107,6 +110,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CERULEAN_LASS",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 33,
@@ -135,6 +139,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CERULEAN_RIVAL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 22,
@@ -167,10 +172,11 @@
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 50,
       "y": 18,
-      "target_local_id": 10,
+      "target_local_id": "LOCALID_ROUTE9_CUT_TREE",
       "target_map": "MAP_ROUTE9"
     },
     {
+      "local_id": "LOCALID_CERULEAN_WOMAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 12,
@@ -185,6 +191,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CERULEAN_CAVE_GUARD",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 1,

data/maps/CeruleanCity/scripts.inc

@@ -1,10 +1,3 @@
-.set LOCALID_POLICEMAN, 1
-.set LOCALID_GRUNT,     2
-.set LOCALID_SLOWBRO,   5
-.set LOCALID_LASS,      6
-.set LOCALID_RIVAL,     8
-.set LOCALID_WOMAN,     11
-
 CeruleanCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition
 	.byte 0
@@ -15,9 +8,9 @@ CeruleanCity_OnTransition::
 	end
 
 CeruleanCity_EventScript_BlockExits::
-	setobjectxyperm LOCALID_POLICEMAN, 30, 12
+	setobjectxyperm LOCALID_CERULEAN_POLICEMAN, 30, 12
-	setobjectxyperm LOCALID_SLOWBRO, 26, 31
+	setobjectxyperm LOCALID_CERULEAN_SLOWBRO, 26, 31
-	setobjectxyperm LOCALID_LASS, 27, 31
+	setobjectxyperm LOCALID_CERULEAN_LASS, 27, 31
 	return
 
 CeruleanCity_EventScript_RivalTriggerLeft::
@@ -29,14 +22,14 @@ CeruleanCity_EventScript_RivalTriggerLeft::
 CeruleanCity_EventScript_RivalTriggerMid::
 	lockall
 	setvar VAR_TEMP_1, 1
-	setobjectxyperm LOCALID_RIVAL, 23, 0
+	setobjectxyperm LOCALID_CERULEAN_RIVAL, 23, 0
 	goto CeruleanCity_EventScript_Rival
 	end
 
 CeruleanCity_EventScript_RivalTriggerRight::
 	lockall
 	setvar VAR_TEMP_1, 2
-	setobjectxyperm LOCALID_RIVAL, 24, 0
+	setobjectxyperm LOCALID_CERULEAN_RIVAL, 24, 0
 	goto CeruleanCity_EventScript_Rival
 	end
 
@@ -44,11 +37,11 @@ CeruleanCity_EventScript_Rival::
 	textcolor NPC_TEXT_COLOR_MALE
 	setvar VAR_MAP_SCENE_ROUTE22, 2
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	addobject LOCALID_RIVAL
+	addobject LOCALID_CERULEAN_RIVAL
-	applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter
+	applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalEnter
 	waitmovement 0
 	msgbox CeruleanCity_Text_RivalIntro
-	setvar VAR_LAST_TALKED, LOCALID_RIVAL
+	setvar VAR_LAST_TALKED, LOCALID_CERULEAN_RIVAL
 	call_if_eq VAR_STARTER_MON, 2, CeruleanCity_EventScript_RivalSquirtle
 	call_if_eq VAR_STARTER_MON, 1, CeruleanCity_EventScript_RivalBulbasaur
 	call_if_eq VAR_STARTER_MON, 0, CeruleanCity_EventScript_RivalCharmander
@@ -65,10 +58,10 @@ CeruleanCity_EventScript_Rival::
 	giveitem ITEM_FAME_CHECKER
 	msgbox CeruleanCity_Text_ExplainFameCheckerSmellYa
 	closemessage
-	applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalExit
+	applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalExit
 	waitmovement 0
 	fadedefaultbgm
-	removeobject LOCALID_RIVAL
+	removeobject LOCALID_CERULEAN_RIVAL
 	releaseall
 	end
 
@@ -85,14 +78,14 @@ CeruleanCity_EventScript_RivalCharmander::
 	return
 
 CeruleanCity_EventScript_RivalStartExit::
-	applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
+	applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
-	applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit
+	applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalStartExit
 	waitmovement 0
 	return
 
 CeruleanCity_EventScript_RivalStartExitRight::
-	applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
+	applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
-	applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight
+	applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalStartExitRight
 	waitmovement 0
 	return
 
@@ -189,7 +182,7 @@ CeruleanCity_EventScript_GruntDefeated::
 	msgbox CeruleanCity_Text_BetterGetMovingBye
 	closemessage
 	fadescreen FADE_TO_BLACK
-	removeobject LOCALID_GRUNT
+	removeobject LOCALID_CERULEAN_GRUNT
 	fadescreen FADE_FROM_BLACK
 	setflag FLAG_GOT_TM28_FROM_ROCKET
 	release
@@ -204,9 +197,9 @@ CeruleanCity_EventScript_NoRoomForTM28::
 CeruleanCity_EventScript_GruntTriggerTop::
 	lockall
 	setvar VAR_TEMP_1, 0
-	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_CERULEAN_GRUNT, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	goto CeruleanCity_EventScript_GruntTrigger
 	end
@@ -214,9 +207,9 @@ CeruleanCity_EventScript_GruntTriggerTop::
 CeruleanCity_EventScript_GruntTriggerBottom::
 	lockall
 	setvar VAR_TEMP_1, 1
-	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_CERULEAN_GRUNT, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	goto CeruleanCity_EventScript_GruntTrigger
 	end
@@ -224,7 +217,7 @@ CeruleanCity_EventScript_GruntTriggerBottom::
 CeruleanCity_EventScript_GruntTrigger::
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox CeruleanCity_Text_GruntIntro
-	setvar VAR_LAST_TALKED, LOCALID_GRUNT
+	setvar VAR_LAST_TALKED, LOCALID_CERULEAN_GRUNT
 	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto CeruleanCity_EventScript_GruntDefeated
@@ -235,7 +228,7 @@ CeruleanCity_EventScript_Policeman::
 	faceplayer
 	msgbox CeruleanCity_Text_PeopleHereWereRobbed
 	closemessage
-	applymovement LOCALID_POLICEMAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_CERULEAN_POLICEMAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -270,7 +263,7 @@ CeruleanCity_EventScript_Woman::
 	faceplayer
 	msgbox CeruleanCity_Text_WantBrightRedBicycle
 	closemessage
-	applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_CERULEAN_WOMAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -285,7 +278,7 @@ CeruleanCity_EventScript_Lass::
 	waitmessage
 	delay 40
 	playse SE_PIN
-	applymovement LOCALID_SLOWBRO, Common_Movement_QuestionMark
+	applymovement LOCALID_CERULEAN_SLOWBRO, Common_Movement_QuestionMark
 	waitmovement 0
 	delay 30
 	call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1

data/maps/CeruleanCity_Gym/scripts.inc

@@ -13,7 +13,7 @@ CeruleanCity_Gym_EventScript_MistyDefeated::
 	famechecker FAMECHECKER_MISTY, 1
 	setflag FLAG_DEFEATED_MISTY
 	setflag FLAG_BADGE02_GET
-	setrespawn SPAWN_CERULEAN_CITY
+	setrespawn HEAL_LOCATION_CERULEAN_CITY
 	set_gym_trainers 2
 	goto CeruleanCity_Gym_EventScript_GiveTM03
 	end

data/maps/CeruleanCity_House4/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_WONDER_NEWS_BERRY_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 5,

data/maps/CeruleanCity_House4/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_WONDER_NEWS_BERRY_MAN, 1
-
 .set REWARD_TYPE, VAR_0x8004
 .set REWARD_ITEM, VAR_0x8008
 

data/maps/CeruleanCity_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_CERULEAN_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ CeruleanCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 CeruleanCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_CERULEAN_CITY
+	setrespawn HEAL_LOCATION_CERULEAN_CITY
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_Nurse::

data/maps/CinnabarIsland/map.json

@@ -55,6 +55,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CINNABAR_BILL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 20,
@@ -69,6 +70,7 @@
       "flag": "FLAG_HIDE_CINNABAR_BILL"
     },
     {
+      "local_id": "LOCALID_CINNABAR_SEAGALLOP",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 23,

data/maps/CinnabarIsland/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_BILL, 3
-.equ LOCALID_SEAGALLOP, 4
-
 CinnabarIsland_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame
@@ -17,27 +14,27 @@ CinnabarIsland_OnTransition::
 CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter::
 	savebgm MUS_FOLLOW_ME
 	setflag FLAG_TEMP_2
-	setobjectxyperm LOCALID_BILL, 15, 12
+	setobjectxyperm LOCALID_CINNABAR_BILL, 15, 12
-	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
+	setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_LEFT
-	setobjectxyperm LOCALID_SEAGALLOP, 30, 12
+	setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 12
 	return
 
 CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland::
 	getplayerxy VAR_0x8004, VAR_0x8005
 	goto_if_ge VAR_0x8004, 18, CinnabarIsland_EventScript_MoveSeagallopDown
 	setflag FLAG_TEMP_2
-	setobjectxyperm LOCALID_BILL, 18, 12
+	setobjectxyperm LOCALID_CINNABAR_BILL, 18, 12
-	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP
-	setobjectxyperm LOCALID_SEAGALLOP, 30, 12
+	setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 12
 	return
 
 CinnabarIsland_EventScript_MoveSeagallopDown::
-	setobjectxyperm LOCALID_SEAGALLOP, 30, 8
+	setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 8
 	return
 
 CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands::
-	setobjectxyperm LOCALID_BILL, 21, 8
+	setobjectxyperm LOCALID_CINNABAR_BILL, 21, 8
-	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP
 	return
 
 CinnabarIsland_EventScript_CheckUnlockGym::
@@ -70,9 +67,9 @@ CinnabarIsland_EventScript_ReturnFromSeviiIslands::
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain
 	closemessage
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillExit
 	waitmovement 0
-	removeobject LOCALID_BILL
+	removeobject LOCALID_CINNABAR_BILL
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
 	setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
 	clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
@@ -94,9 +91,9 @@ CinnabarIsland_EventScript_BillScene::
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
 	playse SE_PIN
-	applymovement LOCALID_BILL, Common_Movement_ExclamationMark
+	applymovement LOCALID_CINNABAR_BILL, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_BILL, Common_Movement_Delay48
+	applymovement LOCALID_CINNABAR_BILL, Common_Movement_Delay48
 	waitmovement 0
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
@@ -107,24 +104,24 @@ CinnabarIsland_EventScript_BillScene::
 	end
 
 CinnabarIsland_EventScript_BillFacePlayer1::
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_CINNABAR_BILL, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BillFacePlayer2::
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_CINNABAR_BILL, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BillApproachPlayer1::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachPlayer1
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BillApproachPlayer2::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachPlayer2
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	return
 
@@ -140,14 +137,14 @@ CinnabarIsland_EventScript_DeclineSailToOneIsland::
 	closemessage
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillReturnToPokeCenter
-	removeobject LOCALID_BILL
+	removeobject LOCALID_CINNABAR_BILL
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
 	clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	releaseall
 	end
 
 CinnabarIsland_EventScript_BillExitToPokeCenter::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillExitToPokeCenter
 	waitmovement 0
 	return
 
@@ -162,12 +159,12 @@ CinnabarIsland_Movement_BillExitToPokeCenter::
 	step_end
 
 CinnabarIsland_EventScript_BillReturnToPokeCenter::
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
+	applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachDoor
 	waitmovement 0
 	opendoor 14, 11
 	waitdooranim
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter
 	waitmovement 0
 	closedoor 14, 11
 	waitdooranim
@@ -193,7 +190,7 @@ CinnabarIsland_Movement_BillReEnterPokeCenter::
 @ Can be triggered outside, or after talking to Bill in the poke center
 CinnabarIsland_EventScript_SailToOneIsland::
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore
-	addobject LOCALID_SEAGALLOP
+	addobject LOCALID_CINNABAR_SEAGALLOP
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArriveExitedPokeCenter
 	msgbox CinnabarIsland_Text_MyPalsBoatArrived
@@ -201,7 +198,7 @@ CinnabarIsland_EventScript_SailToOneIsland::
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoat
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoatExitedPokeCenter
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
-	removeobject LOCALID_BILL
+	removeobject LOCALID_CINNABAR_BILL
 	delay 40
 	setflag FLAG_HIDE_CINNABAR_SEAGALLOP
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
@@ -211,31 +208,31 @@ CinnabarIsland_EventScript_SailToOneIsland::
 	end
 
 CinnabarIsland_EventScript_ApproachShore::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_ApproachShore
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore
+	applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ApproachShore
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BoatArrive::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillFaceBoat
-	applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
+	applymovement LOCALID_CINNABAR_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BoatArriveExitedPokeCenter::
-	applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
+	applymovement LOCALID_CINNABAR_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BoardBoat::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillBoardBoat
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
+	applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BoardBoatExitedPokeCenter::
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
+	applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
+	applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
 	waitmovement 0
 	return
 
@@ -313,12 +310,12 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore::
 @ Triggered when VAR_TEMP_1 is 0
 CinnabarIsland_EventScript_GymDoorLocked::
 	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 20
 	msgbox CinnabarIsland_Text_DoorIsLocked
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor
+	applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor
 	waitmovement 0
 	releaseall
 	end

data/maps/CinnabarIsland_Gym/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_QUINN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 25,
@@ -44,6 +45,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_AVERY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 17,
@@ -58,6 +60,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_RAMON",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 16,
@@ -72,6 +75,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_DEREK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 16,
@@ -86,6 +90,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_DUSTY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 4,
@@ -100,6 +105,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_ZAC",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 4,

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -1,10 +1,3 @@
-.set LOCALID_QUINN, 1
-.set LOCALID_AVERY, 3
-.set LOCALID_RAMON, 4
-.set LOCALID_DEREK, 5
-.set LOCALID_DUSTY, 6
-.set LOCALID_ZAC,   7
-
 CinnabarIsland_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad
 	.byte 0
@@ -64,7 +57,7 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine::
 	famechecker FAMECHECKER_BLAINE, 1
 	setflag FLAG_DEFEATED_BLAINE
 	setflag FLAG_BADGE07_GET
-	setrespawn SPAWN_CINNABAR_ISLAND
+	setrespawn HEAL_LOCATION_CINNABAR_ISLAND
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
 	clearflag FLAG_HIDE_CINNABAR_BILL
 	set_gym_trainers 7
@@ -271,13 +264,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn::
 	end
 
 CinnabarIsland_Gym_EventScript_QuinnApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_QuinnApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight
 	waitmovement 0
 	return
@@ -343,13 +336,13 @@ CinnabarIsland_Gym_EventScript_BattleAvery::
 	end
 
 CinnabarIsland_Gym_EventScript_AveryApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
+	applymovement LOCALID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
 	applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_AveryApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
+	applymovement LOCALID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
 	applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachRight
 	waitmovement 0
 	return
@@ -424,13 +417,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
 	end
 
 CinnabarIsland_Gym_EventScript_RamonApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_RamonApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight
 	waitmovement 0
 	return
@@ -496,13 +489,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek::
 	end
 
 CinnabarIsland_Gym_EventScript_DerekApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_DerekApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight
 	waitmovement 0
 	return
@@ -568,13 +561,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty::
 	end
 
 CinnabarIsland_Gym_EventScript_DustyApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_DustyApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight
 	waitmovement 0
 	return
@@ -640,13 +633,13 @@ CinnabarIsland_Gym_EventScript_BattleZac::
 	end
 
 CinnabarIsland_Gym_EventScript_ZacApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_ZacApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight
 	waitmovement 0
 	return

data/maps/CinnabarIsland_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_CINNABAR_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
@@ -100,6 +101,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
+      "local_id": "LOCALID_CINNABAR_POKEMON_CENTER_BILL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 11,

data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc

@@ -1,12 +1,10 @@
-.set LOCALID_BILL, 7
-
 CinnabarIsland_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 CinnabarIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_CINNABAR_ISLAND
+	setrespawn HEAL_LOCATION_CINNABAR_ISLAND
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_Nurse::
@@ -43,7 +41,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
 	call_if_eq VAR_FACING, DIR_SOUTH, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth
 	call_if_eq VAR_FACING, DIR_EAST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast
 	call_if_eq VAR_FACING, DIR_WEST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest
-	removeobject LOCALID_BILL
+	removeobject LOCALID_CINNABAR_POKEMON_CENTER_BILL
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
 	clearflag FLAG_HIDE_CINNABAR_BILL
 	warp MAP_CINNABAR_ISLAND, 14, 11
@@ -52,20 +50,20 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth::
-	applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
+	applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
+	applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
 	waitmovement 0
 	return
 
 CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast::
-	applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
+	applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
+	applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
 	waitmovement 0
 	return
 
 CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest::
-	applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
+	applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
+	applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
 	waitmovement 0
 	return
 

data/maps/FiveIsland/map.json

@@ -59,7 +59,7 @@
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 32,
       "y": 9,
-      "target_local_id": 4,
+      "target_local_id": "LOCALID_FIVE_ISLAND_MEADOW_BORDER_TREE",
       "target_map": "MAP_FIVE_ISLAND_MEADOW"
     }
   ],

data/maps/FiveIsland_LostCave_Room10/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_LOST_CAVE_SELPHY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,

data/maps/FiveIsland_LostCave_Room10/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_SELPHY, 1
-
 FiveIsland_LostCave_Room10_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame
@@ -20,10 +18,10 @@ FiveIsland_LostCave_Room10_OnFrame::
 FiveIsland_LostCave_Room10_EventScript_FindSelphyScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_FEMALE
-	applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander
+	applymovement LOCALID_LOST_CAVE_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander
 	waitmovement 0
 	delay 100
-	applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyApproach
+	applymovement LOCALID_LOST_CAVE_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyApproach
 	waitmovement 0
 	msgbox FiveIsland_LostCave_Room10_Text_SelphyIntro
 	goto_if_questlog FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog

data/maps/FiveIsland_Meadow/map.json

@@ -69,6 +69,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "local_id": "LOCALID_FIVE_ISLAND_MEADOW_BORDER_TREE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 8,

data/maps/FiveIsland_MemorialPillar/map.json

@@ -22,6 +22,7 @@
   ],
   "object_events": [
     {
+      "local_id": "LOCALID_MEMORIAL_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 8,

data/maps/FiveIsland_MemorialPillar/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_MEMORIAL_MAN, 1
-
 FiveIsland_MemorialPillar_MapScripts::
 	.byte 0
 
@@ -57,7 +55,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
 	applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 45
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis

data/maps/FiveIsland_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_FIVE_ISLAND_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/FiveIsland_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ FiveIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 FiveIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_FIVE_ISLAND
+	setrespawn HEAL_LOCATION_FIVE_ISLAND
 	end
 
 FiveIsland_PokemonCenter_1F_EventScript_Nurse::

data/maps/FiveIsland_ResortGorgeous/map.json

@@ -120,6 +120,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_RESORT_GORGEOUS_SELPHY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 39,

data/maps/FiveIsland_ResortGorgeous/scripts.inc

@@ -1,5 +1,3 @@
-.equ LOCALID_SELPHY, 8
-
 FiveIsland_ResortGorgeous_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame
@@ -10,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp::
 	.2byte 0
 
 FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 FiveIsland_ResortGorgeous_OnFrame::
@@ -22,15 +20,15 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
 	closemessage
-	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_RESORT_GORGEOUS_SELPHY, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	opendoor 39, 8
 	waitdooranim
-	applymovement LOCALID_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome
+	applymovement LOCALID_RESORT_GORGEOUS_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome
 	waitmovement 0
 	closedoor 39, 8
 	waitdooranim
-	removeobject LOCALID_SELPHY
+	removeobject LOCALID_RESORT_GORGEOUS_SELPHY
 	clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY
 	setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2
 	releaseall

data/maps/FiveIsland_ResortGorgeous_House/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 4,
@@ -30,6 +31,7 @@
       "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
     },
     {
+      "local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 6,

data/maps/FiveIsland_ResortGorgeous_House/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_SELPHY, 1
-.equ LOCALID_BUTLER, 2
-
 .equ SHOWN_REQUESTED_MON, FLAG_TEMP_2
 
 FiveIsland_ResortGorgeous_House_MapScripts::
@@ -39,12 +36,12 @@ FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon::
 FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	special SampleResortGorgeousMonAndReward
 	msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou
-	addobject LOCALID_BUTLER
+	addobject LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER
-	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
-	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -55,7 +52,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	call_if_eq VAR_FACING, DIR_SOUTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
 	call_if_eq VAR_FACING, DIR_EAST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
 	call_if_eq VAR_FACING, DIR_WEST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
-	copyobjectxytoperm LOCALID_BUTLER
+	copyobjectxytoperm LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks
 	giveitem VAR_RESORT_GORGEOUS_REWARD
 	goto_if_eq VAR_RESULT, FALSE, FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
@@ -65,30 +62,30 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	end
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
-	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterDown
-	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
-	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
-	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterLeft
-	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest::
-	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
+	applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
 	waitmovement 0
 	return
 

data/maps/FiveIsland_RocketWarehouse/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_WAREHOUSE_GRUNT2",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 15,
@@ -30,6 +31,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "local_id": "LOCALID_WAREHOUSE_GRUNT3",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 17,
@@ -44,6 +46,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "local_id": "LOCALID_WAREHOUSE_ADMIN1",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_F",
       "x": 27,
@@ -58,6 +61,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "local_id": "LOCALID_WAREHOUSE_ADMIN2",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 25,

data/maps/FiveIsland_RocketWarehouse/scripts.inc

@@ -1,9 +1,3 @@
-.equ LOCALID_GRUNT1, 5
-.equ LOCALID_GRUNT2, 1
-.equ LOCALID_GRUNT3, 2
-.equ LOCALID_ADMIN1, 3
-.equ LOCALID_ADMIN2, 4
-
 .equ PLAYER_X_POS, VAR_0x8004
 .equ PLAYER_Y_POS, VAR_0x8005
 
@@ -43,7 +37,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer::
 
 FiveIsland_RocketWarehouse_EventScript_Admin2Trigger::
 	lockall
-	applymovement LOCALID_ADMIN2, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_WAREHOUSE_ADMIN2, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
 	releaseall
@@ -88,10 +82,10 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
 	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
-	removeobject LOCALID_GRUNT2
+	removeobject LOCALID_WAREHOUSE_GRUNT2
-	removeobject LOCALID_GRUNT3
+	removeobject LOCALID_WAREHOUSE_GRUNT3
-	removeobject LOCALID_ADMIN2
+	removeobject LOCALID_WAREHOUSE_ADMIN2
-	removeobject LOCALID_ADMIN1
+	removeobject LOCALID_WAREHOUSE_ADMIN1
 	setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
 	fadescreen FADE_FROM_BLACK
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
@@ -100,7 +94,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
 	end
 
 FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	return
 
@@ -138,32 +132,32 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1::
 
 FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
 	goto_if_eq PLAYER_X_POS, 27, EventScript_Return
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	return
 
 FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar::
-	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
+	applymovement LOCALID_WAREHOUSE_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
 	waitmovement 0
 	return
 
 FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch::
-	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
+	applymovement LOCALID_WAREHOUSE_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
 	waitmovement 0
 	return
 
 FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch::
-	applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft::
-	applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown::
-	applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 

data/maps/FourIsland/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_FOUR_ISLAND_DAYCARE_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 16,
@@ -142,6 +143,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST"
     },
     {
+      "local_id": "LOCALID_FOUR_ISLAND_RIVAL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 8,

data/maps/FourIsland/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_DAYCARE_MAN, 1
-.equ LOCALID_RIVAL, 10
-
 FourIsland_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame
@@ -18,7 +15,7 @@ FourIsland_EventScript_ShowRival::
 
 FourIsland_EventScript_TrySetDayCareManPos::
 	goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos
-	setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14
+	setobjectxyperm LOCALID_FOUR_ISLAND_DAYCARE_MAN, 16, 14
 FourIsland_EventScript_EndSetDayCareManPos::
 	return
 
@@ -29,25 +26,25 @@ FourIsland_OnFrame::
 FourIsland_EventScript_RivalScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
+	applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_RIVAL, Common_Movement_Delay48
+	applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_Delay48
 	waitmovement 0
 	delay 25
-	applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach
+	applymovement LOCALID_FOUR_ISLAND_RIVAL, FourIsland_Movement_RivalApproach
 	waitmovement 0
 	msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
+	applymovement LOCALID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
-	applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
+	applymovement LOCALID_FOUR_ISLAND_RIVAL, FourIsland_Movement_RivalExit
 	waitmovement 0
 	fadedefaultbgm
 	playse SE_EXIT
 	delay 35
-	removeobject LOCALID_RIVAL
+	removeobject LOCALID_FOUR_ISLAND_RIVAL
 	setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
 	releaseall
 	end

data/maps/FourIsland_House2/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_STICKER_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,

data/maps/FourIsland_IcefallCave_1F/scripts.inc

@@ -19,7 +19,7 @@ FourIsland_IcefallCave_1F_OnFrame::
 FourIsland_IcefallCave_1F_EventScript_FallDownHole::
 	lockall
 	delay 20
-	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
+	applymovement LOCALID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
 	waitmovement 0
 	playse SE_FALL
 	delay 60

data/maps/FourIsland_IcefallCave_Back/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_ICEFALL_ROCKET1",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,
@@ -30,6 +31,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
     },
     {
+      "local_id": "LOCALID_ICEFALL_ROCKET2",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 13,
@@ -44,6 +46,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
     },
     {
+      "local_id": "LOCALID_ICEFALL_LORELEI",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LORELEI",
       "x": 12,
@@ -58,6 +61,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
     },
     {
+      "local_id": "LOCALID_ICEFALL_ROCKET3",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 10,

data/maps/FourIsland_IcefallCave_Back/scripts.inc

@@ -1,8 +1,3 @@
-.equ LOCALID_ROCKET1, 1
-.equ LOCALID_ROCKET2, 2
-.equ LOCALID_LORELEI, 3
-.equ LOCALID_ROCKET3, 4
-
 FourIsland_IcefallCave_Back_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
 	.byte 0
@@ -19,39 +14,39 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
-	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
+	applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
 	closemessage
 	playse SE_PIN
-	applymovement LOCALID_LORELEI, Common_Movement_ExclamationMark
+	applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
-	applymovement LOCALID_LORELEI, Common_Movement_Delay48
+	applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_Delay48
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
 	closemessage
-	applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 18
-	applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	delay 35
-	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
+	applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
-	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
+	applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
-	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
+	applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
 	waitmovement 0
-	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
+	applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_ROCKET, 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
-	setvar VAR_LAST_TALKED, LOCALID_ROCKET3
+	setvar VAR_LAST_TALKED, LOCALID_ICEFALL_ROCKET3
 	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
-	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
+	applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
@@ -64,24 +59,24 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER
 	waitbuttonpress
 	waitmoncry
-	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
+	applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
 	closemessage
-	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
+	applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
-	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
+	applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
-	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
+	applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
-	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
+	applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
-	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
+	applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
 	waitmovement 0
-	removeobject LOCALID_ROCKET1
+	removeobject LOCALID_ICEFALL_ROCKET1
-	removeobject LOCALID_ROCKET2
+	removeobject LOCALID_ICEFALL_ROCKET2
-	removeobject LOCALID_ROCKET3
+	removeobject LOCALID_ICEFALL_ROCKET3
 	delay 50
-	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
+	applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful

data/maps/FourIsland_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_FOUR_ISLAND_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/FourIsland_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ FourIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 FourIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_FOUR_ISLAND
+	setrespawn HEAL_LOCATION_FOUR_ISLAND
 	end
 
 FourIsland_PokemonCenter_1F_EventScript_Nurse::

data/maps/FourIsland_PokemonDayCare/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_FOUR_ISLAND_DAYCARE_WOMAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 2,

data/maps/FourIsland_PokemonDayCare/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_DAYCARE_WOMAN, 1
-
 FourIsland_PokemonDayCare_MapScripts::
 	.byte 0
 
@@ -113,7 +111,7 @@ FourIsland_PokemonDayCare_CheckEnoughMoney::
 	end
 
 FourIsland_PokemonDayCare_RetrieveMon::
-	applymovement LOCALID_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon
+	applymovement LOCALID_FOUR_ISLAND_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon
 	waitmovement 0
 	specialvar VAR_RESULT, TakePokemonFromDaycare
 	special SubtractMoneyFromVar0x8005

data/maps/FuchsiaCity_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_FUCHSIA_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ FuchsiaCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 FuchsiaCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_FUCHSIA_CITY
+	setrespawn HEAL_LOCATION_FUCHSIA_CITY
 	end
 
 FuchsiaCity_PokemonCenter_1F_EventScript_Nurse::

data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc

@@ -12,11 +12,11 @@ FuchsiaCity_SafariZone_Entrance_OnFrame::
 FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter
 	waitmovement 0
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2
 	waitmovement 0
 	special ExitSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -29,7 +29,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn::
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
 	waitmovement 0
 	special ExitSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -44,7 +44,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly::
 	goto_if_eq VAR_RESULT, NO, FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
 	waitmovement 0
 	special ExitSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -54,7 +54,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly::
 FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone::
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_GoodLuck
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter
 	waitmovement 0
 	warp MAP_SAFARI_ZONE_CENTER, 26, 30
 	waitstate
@@ -100,7 +100,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft::
 FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone::
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	showmoneybox 0, 0
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
@@ -134,17 +134,17 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone::
 	end
 
 FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight::
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight
 	waitmovement 0
 	return
 
 FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid::
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid
 	waitmovement 0
 	return
 
 FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft
 	waitmovement 0
 	return
 
@@ -165,7 +165,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney::
 FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack::
 	closemessage
 	hidemoneybox
-	applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack
+	applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack
 	waitmovement 0
 	releaseall
 	end

data/maps/IndigoPlateau_Exterior/map.json

@@ -22,6 +22,7 @@
   ],
   "object_events": [
     {
+      "local_id": "LOCALID_CREDITS_RIVAL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 11,
@@ -36,6 +37,7 @@
       "flag": "FLAG_HIDE_CREDITS_RIVAL"
     },
     {
+      "local_id": "LOCALID_CREDITS_PROF_OAK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 11,

data/maps/IndigoPlateau_Exterior/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_RIVAL,    1
-.equ LOCALID_PROF_OAK, 2
-
 IndigoPlateau_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame
@@ -32,54 +29,54 @@ IndigoPlateau_Exterior_EventScript_Credits::
 	opendoor 11, 6
 	waitdooranim
 	special SpawnCameraObject
-	addobject LOCALID_RIVAL
+	addobject LOCALID_CREDITS_RIVAL
-	applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
+	applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
 	waitmovement 0
 	closedoor 11, 6
 	waitdooranim
 
 	@ Rival runs off
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
-	applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
+	applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
 	waitmovement 0
 	delay 100
 
 	@ Oak exits building
 	opendoor 11, 6
 	waitdooranim
-	addobject LOCALID_PROF_OAK
+	addobject LOCALID_CREDITS_PROF_OAK
-	applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
+	applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
 	waitmovement 0
 	closedoor 11, 6
 	waitdooranim
 	delay 160
 
 	@ Oak looks at player, then walks off
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
-	applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
+	applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
 	waitmovement 0
 	delay 100
 
 	@ Player begin to leave
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
 	waitmovement 0
 	delay 155
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
 	waitmovement 0
 	delay 90
 
 	@ Player runs off
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
+	applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
 	waitmovement 0
 
 	@ Reset the map state and roll the credits
 	special RemoveCameraObject
 	setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
-	removeobject LOCALID_RIVAL
+	removeobject LOCALID_CREDITS_RIVAL
-	removeobject LOCALID_PROF_OAK
+	removeobject LOCALID_CREDITS_PROF_OAK
 	special DoCredits
 	waitstate
 	releaseall

data/maps/IndigoPlateau_PokemonCenter_1F/map.json

@@ -30,6 +30,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_LEAGUE_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 13,
@@ -58,6 +59,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_LEAGUE_DOOR_GUARD",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 5,

data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc

@@ -1,19 +1,17 @@
-.set LOCALID_DOOR_GUARD, 4
-
 IndigoPlateau_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 IndigoPlateau_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_INDIGO_PLATEAU
+	setrespawn HEAL_LOCATION_INDIGO_PLATEAU
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	call_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
 	end
 
 IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor::
 	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return
-	setobjectxyperm LOCALID_DOOR_GUARD, 4, 2
+	setobjectxyperm LOCALID_LEAGUE_DOOR_GUARD, 4, 2
 	return
 
 IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard::

data/maps/LavenderTown_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_LAVENDER_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/LavenderTown_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ LavenderTown_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 LavenderTown_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_LAVENDER_TOWN
+	setrespawn HEAL_LOCATION_LAVENDER_TOWN
 	end
 
 LavenderTown_PokemonCenter_1F_EventScript_Nurse::

data/maps/MtEmber_Exterior/map.json

@@ -30,6 +30,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_MT_EMBER_GRUNT1",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 41,
@@ -44,6 +45,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
     },
     {
+      "local_id": "LOCALID_MT_EMBER_GRUNT2",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 42,

data/maps/MtEmber_Exterior/scripts.inc

@@ -1,6 +1,3 @@
-.set LOCALID_GRUNT1, 2
-.set LOCALID_GRUNT2, 3
-
 MtEmber_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad
@@ -12,8 +9,8 @@ MtEmber_Exterior_OnTransition::
 	end
 
 MtEmber_Exterior_EventScript_RocketsFaceDown::
-	setobjectmovementtype LOCALID_GRUNT1, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_MT_EMBER_GRUNT1, MOVEMENT_TYPE_FACE_DOWN
-	setobjectmovementtype LOCALID_GRUNT2, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_MT_EMBER_GRUNT2, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 MtEmber_Exterior_OnLoad::
@@ -38,7 +35,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated::
 	end
 
 MtEmber_Exterior_EventScript_BattleGrunt1::
-	applymovement LOCALID_GRUNT1, Common_Movement_FacePlayer
+	applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_FacePlayer
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_ROCKET, 0
 	msgbox MtEmber_Exterior_Text_Grunt1Intro
@@ -52,8 +49,8 @@ MtEmber_Exterior_EventScript_DefeatedBothGrunts::
 	msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere
 	closemessage
 	fadescreen FADE_TO_BLACK
-	removeobject LOCALID_GRUNT1
+	removeobject LOCALID_MT_EMBER_GRUNT1
-	removeobject LOCALID_GRUNT2
+	removeobject LOCALID_MT_EMBER_GRUNT2
 	fadescreen FADE_FROM_BLACK
 	release
 	end
@@ -65,7 +62,7 @@ MtEmber_Exterior_EventScript_Grunt2::
 	goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt2
 	msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
 	closemessage
-	applymovement LOCALID_GRUNT2, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -91,18 +88,18 @@ MtEmber_Exterior_EventScript_RocketPasswordScene::
 	message MtEmber_Exterior_Text_WhatsPasswordAgain
 	waitmessage
 	playse SE_PIN
-	applymovement LOCALID_GRUNT2, Common_Movement_QuestionMark
+	applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_QuestionMark
 	waitmovement 0
 	waitbuttonpress
 	msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
-	applymovement LOCALID_GRUNT1, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement LOCALID_GRUNT1, Common_Movement_ExclamationMark
+	applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_GRUNT1, Common_Movement_Delay48
+	applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement LOCALID_GRUNT2, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	call MtEmber_Exterior_EventScript_RocketsFaceDown
 	msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn

data/maps/MtEmber_RubyPath_B3F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_RUBY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
       "x": 10,

data/maps/MtEmber_RubyPath_B3F/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_RUBY, 1
-
 MtEmber_RubyPath_B3F_MapScripts::
 	.byte 0
 

data/maps/MtMoon_B2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_DOME_FOSSIL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FOSSIL",
       "x": 13,
@@ -30,6 +31,7 @@
       "flag": "FLAG_HIDE_DOME_FOSSIL"
     },
     {
+      "local_id": "LOCALID_HELIX_FOSSIL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FOSSIL",
       "x": 14,
@@ -44,6 +46,7 @@
       "flag": "FLAG_HIDE_HELIX_FOSSIL"
     },
     {
+      "local_id": "LOCALID_MIGUEL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 13,

data/maps/MtMoon_B2F/scripts.inc

@@ -1,7 +1,3 @@
-.equ LOCALID_DOME_FOSSIL,  1
-.equ LOCALID_HELIX_FOSSIL, 2
-.equ LOCALID_MIGUEL,       3
-
 MtMoon_B2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition
 	.byte 0

data/maps/NavelRock_Base/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_NAVEL_ROCK_LUGIA",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LUGIA",
       "x": 10,

data/maps/NavelRock_Base/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_LUGIA, 1
-
 NavelRock_Base_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume
@@ -26,7 +24,7 @@ NavelRock_Base_OnResume::
 NavelRock_Base_EventScript_TryRemoveLugia::
 	specialvar VAR_RESULT, GetBattleOutcome
 	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	removeobject LOCALID_LUGIA
+	removeobject LOCALID_NAVEL_ROCK_LUGIA
 	return
 
 NavelRock_Base_EventScript_Lugia::

data/maps/NavelRock_Summit/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_NAVEL_ROCK_HO_OH",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_HO_OH",
       "x": 9,

data/maps/NavelRock_Summit/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_HO_OH, 1
-
 NavelRock_Summit_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume
@@ -29,7 +27,7 @@ NavelRock_Summit_OnResume::
 NavelRock_Summit_EventScript_TryRemoveHoOh::
 	specialvar VAR_RESULT, GetBattleOutcome
 	goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
-	removeobject LOCALID_HO_OH
+	removeobject LOCALID_NAVEL_ROCK_HO_OH
 	return
 
 NavelRock_Summit_EventScript_HoOh::
@@ -41,8 +39,8 @@ NavelRock_Summit_EventScript_HoOh::
 	setvar VAR_0x8004, 3  @ Num loops
 	setvar VAR_0x8005, 35 @ Delay
 	special LoopWingFlapSound
-	applymovement LOCALID_HO_OH, Movement_HoOhAppear
+	applymovement LOCALID_NAVEL_ROCK_HO_OH, Movement_HoOhAppear
-	applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp
+	applymovement LOCALID_CAMERA, Movement_CameraPanUp
 	waitmovement 0
 	delay 50
 	setweather 0
@@ -55,8 +53,8 @@ NavelRock_Summit_EventScript_HoOh::
 	setvar VAR_0x8004, 3  @ Num loops
 	setvar VAR_0x8005, 35 @ Delay
 	special LoopWingFlapSound
-	applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown
+	applymovement LOCALID_CAMERA, Movement_CameraPanDown
-	applymovement LOCALID_HO_OH, Movement_HoOhApproach
+	applymovement LOCALID_NAVEL_ROCK_HO_OH, Movement_HoOhApproach
 	waitmovement 0
 	special RemoveCameraObject
 	seteventmon SPECIES_HO_OH, 70
@@ -64,7 +62,7 @@ NavelRock_Summit_EventScript_HoOh::
 	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	setvar VAR_LAST_TALKED, LOCALID_HO_OH
+	setvar VAR_LAST_TALKED, LOCALID_NAVEL_ROCK_HO_OH
 	specialvar VAR_RESULT, GetBattleOutcome
 	goto_if_eq VAR_RESULT, B_OUTCOME_WON, NavelRock_Summit_EventScript_DefeatedHoOh
 	goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NavelRock_Summit_EventScript_RanFromHoOh

data/maps/OneIsland/map.json

@@ -27,6 +27,7 @@
   ],
   "object_events": [
     {
+      "local_id": "LOCALID_ONE_ISLAND_BILL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 12,

data/maps/OneIsland/scripts.inc

@@ -1,5 +1,3 @@
-.equ LOCALID_BILL, 1
-
 OneIsland_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame
@@ -16,21 +14,21 @@ OneIsland_OnFrame::
 OneIsland_EventScript_EnterOneIslandFirstTime::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor
+	applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerExitHarbor
 	waitmovement 0
 	msgbox OneIsland_Text_BillLetsGoSeeCelio
 	closemessage
-	applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter
+	applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillWalkToPokeCenter
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter
+	applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter
 	waitmovement 0
 	opendoor 14, 5
 	waitdooranim
-	applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter
+	applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillEnterPokeCenter
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter
+	applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter
 	waitmovement 0
 	closedoor 14, 5
 	waitdooranim
-	removeobject LOCALID_BILL
+	removeobject LOCALID_ONE_ISLAND_BILL
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3
 	warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 9, 9
 	waitstate

data/maps/OneIsland_Harbor/scripts.inc

@@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp::
 	.2byte 0
 
 OneIsland_Harbor_EventScript_TurnPlayerNorth::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 OneIsland_Harbor_OnFrame::
@@ -18,7 +18,7 @@ OneIsland_Harbor_OnFrame::
 OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor
+	applymovement LOCALID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor
 	waitmovement 0
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2
 	warp MAP_ONE_ISLAND, 12, 18

data/maps/OneIsland_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_ONE_ISLAND_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 5,
@@ -30,6 +31,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 14,
@@ -44,6 +46,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
     },
     {
+      "local_id": "LOCALID_CELIO",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CELIO",
       "x": 15,

data/maps/OneIsland_PokemonCenter_1F/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_BILL,  2
-.equ LOCALID_CELIO, 3
-
 OneIsland_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -28,7 +25,7 @@ OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn::
 	return
 
 OneIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_ONE_ISLAND
+	setrespawn HEAL_LOCATION_ONE_ISLAND
 	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6, OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone
 	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos
 	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos
@@ -39,15 +36,15 @@ OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone::
 	return
 
 OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos::
-	setobjectxyperm LOCALID_BILL, 9, 8
+	setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 9, 8
-	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_UP
 	setobjectxyperm LOCALID_CELIO, 15, 6
 	setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP
 	return
 
 OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos::
-	setobjectxyperm LOCALID_BILL, 14, 7
+	setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 14, 7
-	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
+	setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_LEFT
 	setobjectxyperm LOCALID_CELIO, 14, 8
 	setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT
 	return
@@ -59,11 +56,11 @@ OneIsland_PokemonCenter_1F_OnFrame::
 OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
+	applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
-	applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	playse SE_PIN
 	applymovement LOCALID_CELIO, Common_Movement_ExclamationMark
@@ -74,13 +71,13 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut
 	msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp
 	call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp
@@ -92,12 +89,12 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours
 	closemessage
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer
 	msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM
@@ -112,7 +109,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
 	setflag FLAG_SYS_SEVII_MAP_123
 	msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
 	closemessage
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
@@ -192,7 +189,7 @@ OneIsland_PokemonCenter_1F_EventScript_Bill::
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll::
-	applymovement LOCALID_BILL, Common_Movement_FacePlayer
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore
 	release
@@ -440,7 +437,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom::
 OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
 	textcolor NPC_TEXT_COLOR_MALE
 	playse SE_PIN
-	applymovement LOCALID_BILL, Common_Movement_ExclamationMark
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_ExclamationMark
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer
 	closemessage
@@ -450,36 +447,36 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
 	call_if_eq VAR_TEMP_1, 4, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom
 	delay 10
 	msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe
 	closemessage
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	delay 10
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 15
 	msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto
 	closemessage
-	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	delay 15
 	applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime
 	closemessage
 	delay 25
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit
+	applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit
-	applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
+	applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
 	waitmovement 0
 	playse SE_EXIT
 	setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL
@@ -492,22 +489,22 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop::
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop
+	applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop
 	waitmovement 0
 	return
 
 OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop::
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop
+	applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop
 	waitmovement 0
 	return
 
 OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom::
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom
+	applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom
 	waitmovement 0
 	return
 
 OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom::
-	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom
+	applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom
 	waitmovement 0
 	return
 

data/maps/PalletTown/map.json

@@ -27,6 +27,7 @@
   ],
   "object_events": [
     {
+      "local_id": "LOCALID_PALLET_SIGN_LADY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 3,
@@ -41,6 +42,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_PALLET_FAT_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 13,
@@ -55,6 +57,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_PALLET_PROF_OAK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 10,

data/maps/PalletTown/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_SIGN_LADY, 1
-.equ LOCALID_PROF_OAK,  3
-
 .equ SIGN_LADY_READY, VAR_TEMP_2
 
 PalletTown_MapScripts::
@@ -27,13 +24,13 @@ PalletTown_EventScript_SetSignLadyDone::
 
 PalletTown_EventScript_SetSignLadyPos::
 	goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance
-	setobjectxyperm LOCALID_SIGN_LADY, 5, 15
+	setobjectxyperm LOCALID_PALLET_SIGN_LADY, 5, 15
-	setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_UP
 	return
 
 PalletTown_EventScript_MoveSignLadyToRouteEntrance::
-	setobjectxyperm LOCALID_SIGN_LADY, 12, 2
+	setobjectxyperm LOCALID_PALLET_SIGN_LADY, 12, 2
-	setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN
 	setvar SIGN_LADY_READY, TRUE
 	return
 
@@ -45,10 +42,10 @@ PalletTown_OnFrame::
 PalletTown_EventScript_OakRatingScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	setobjectxyperm LOCALID_PROF_OAK, 14, 14
+	setobjectxyperm LOCALID_PALLET_PROF_OAK, 14, 14
-	setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT
+	setobjectmovementtype LOCALID_PALLET_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT
-	addobject LOCALID_PROF_OAK
+	addobject LOCALID_PALLET_PROF_OAK
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor
 	waitmovement 0
 	goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet
 	msgbox PalletTown_Text_OakLetMeSeePokedex
@@ -62,13 +59,13 @@ PalletTown_EventScript_OakRatingScene::
 	msgbox PalletTown_Text_CaughtXImpressiveFollowMe
 	closemessage
 	playbgm MUS_FOLLOW_ME, 0
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
+	applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
 	waitmovement 0
 	opendoor 16, 13
 	waitdooranim
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLab
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab
+	applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab
 	waitmovement 0
 	closedoor 16, 13
 	waitdooranim
@@ -82,9 +79,9 @@ PalletTown_EventScript_OakRatingScene::
 
 PalletTown_EventScript_EndOakRatingScene::
 	closemessage
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakExit
 	waitmovement 0
-	removeobject LOCALID_PROF_OAK
+	removeobject LOCALID_PALLET_PROF_OAK
 	setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3
 	releaseall
 	end
@@ -190,13 +187,13 @@ PalletTown_EventScript_OakTrigger::
 	waitmessage
 	delay 85
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
+	applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 30
-	addobject LOCALID_PROF_OAK
+	addobject LOCALID_PALLET_PROF_OAK
 	call_if_eq VAR_TEMP_1, 0, PalletTown_EventScript_OakEnterLeft
 	call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakEnterRight
 	delay 30
@@ -207,8 +204,8 @@ PalletTown_EventScript_OakTrigger::
 	call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakLeadPlayerToLabRight
 	opendoor 16, 13
 	waitdooranim
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLab
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab
+	applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab
 	waitmovement 0
 	closedoor 16, 13
 	waitdooranim
@@ -223,24 +220,24 @@ PalletTown_EventScript_OakTrigger::
 	end
 
 PalletTown_EventScript_OakEnterLeft::
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLeft
 	waitmovement 0
 	return
 
 PalletTown_EventScript_OakEnterRight::
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterRight
 	waitmovement 0
 	return
 
 PalletTown_EventScript_OakLeadPlayerToLabLeft::
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft
+	applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft
 	waitmovement 0
 	return
 
 PalletTown_EventScript_OakLeadPlayerToLabRight::
-	applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight
+	applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabRight
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight
+	applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight
 	waitmovement 0
 	return
 
@@ -332,48 +329,48 @@ PalletTown_EventScript_SignLady::
 	goto_if_eq SIGN_LADY_READY, TRUE, PalletTown_EventScript_SignLadyStartShowSign
 	goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign
 	msgbox PalletTown_Text_HmmIsThatRight
-	applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement LOCALID_SIGN_LADY, Common_Movement_ExclamationMark
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_SIGN_LADY, Common_Movement_Delay48
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_Delay48
 	waitmovement 0
 	msgbox PalletTown_Text_OhLookLook
 	closemessage
 	call_if_eq VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayRight
 	call_if_ne VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayLeft
-	copyobjectxytoperm LOCALID_SIGN_LADY
+	copyobjectxytoperm LOCALID_PALLET_SIGN_LADY
 	setflag FLAG_TEMP_2
 	release
 	end
 
 PalletTown_EventScript_SignLadyMoveOutOfWayRight::
-	applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight
+	applymovement LOCALID_PALLET_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight
 	waitmovement 0
 	return
 
 PalletTown_EventScript_SignLadyMoveOutOfWayLeft::
-	applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft
+	applymovement LOCALID_PALLET_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft
 	waitmovement 0
 	return
 
 PalletTown_EventScript_SignLadyDone::
-	applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox PalletTown_Text_RaisingMonsToo
 	release
 	end
 
 PalletTown_EventScript_SignLadyGoReadSign::
-	applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox PalletTown_Text_ReadItReadIt
 	release
 	end
 
 PalletTown_EventScript_SignLadyJustShowedSign::
-	applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox PalletTown_Text_SignsAreUsefulArentThey
 	release
@@ -421,8 +418,8 @@ PalletTown_EventScript_TrainerTips::
 
 PalletTown_EventScript_SignLadyTrigger::
 	lockall
-	applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	call PalletTown_EventScript_SignLadyShowSign
 	releaseall
@@ -445,7 +442,7 @@ PalletTown_EventScript_SignLadyShowSign::
 	return
 
 PalletTown_EventScript_SignLadyStartShowSign::
-	applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
+	applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
 	waitmovement 0
 	call PalletTown_EventScript_SignLadyShowSign
 	release

data/maps/PalletTown_PlayersHouse_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_MOM",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MOM",
       "x": 8,

data/maps/PalletTown_PlayersHouse_1F/scripts.inc

@@ -1,5 +1,3 @@
-.equ LOCALID_MOM, 1
-
 PalletTown_PlayersHouse_1F_MapScripts::
 	.byte 0
 

data/maps/PalletTown_PlayersHouse_2F/scripts.inc

@@ -8,7 +8,7 @@ PalletTown_PlayersHouse_2F_OnTransition::
 	end
 
 PalletTown_PlayersHouse_2F_EventScript_SetRespawn::
-	setrespawn SPAWN_PALLET_TOWN
+	setrespawn HEAL_LOCATION_PALLET_TOWN
 	return
 
 PalletTown_PlayersHouse_2F_OnWarp::
@@ -16,7 +16,7 @@ PalletTown_PlayersHouse_2F_OnWarp::
 	.2byte 0
 
 PalletTown_PlayersHouse_2F_FirstWarpIn::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1
 	end
 

data/maps/PalletTown_ProfessorOaksLab/map.json

@@ -58,6 +58,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_OAKS_LAB_PROF_OAK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 6,
@@ -72,6 +73,7 @@
       "flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
     },
     {
+      "local_id": "LOCALID_BULBASAUR_BALL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 8,
@@ -86,6 +88,7 @@
       "flag": "FLAG_HIDE_BULBASAUR_BALL"
     },
     {
+      "local_id": "LOCALID_SQUIRTLE_BALL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
@@ -100,6 +103,7 @@
       "flag": "FLAG_HIDE_SQUIRTLE_BALL"
     },
     {
+      "local_id": "LOCALID_CHARMANDER_BALL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 10,
@@ -114,6 +118,7 @@
       "flag": "FLAG_HIDE_CHARMANDER_BALL"
     },
     {
+      "local_id": "LOCALID_OAKS_LAB_RIVAL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 5,
@@ -128,6 +133,7 @@
       "flag": "FLAG_HIDE_RIVAL_IN_LAB"
     },
     {
+      "local_id": "LOCALID_POKEDEX_1",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POKEDEX",
       "x": 4,
@@ -142,6 +148,7 @@
       "flag": "FLAG_HIDE_POKEDEX"
     },
     {
+      "local_id": "LOCALID_POKEDEX_2",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POKEDEX",
       "x": 5,

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -1,11 +1,3 @@
-.equ LOCALID_PROF_OAK,        4
-.equ LOCALID_BULBASAUR_BALL,  5
-.equ LOCALID_SQUIRTLE_BALL,   6
-.equ LOCALID_CHARMANDER_BALL, 7
-.equ LOCALID_RIVAL,           8
-.equ LOCALID_POKEDEX_1,       9
-.equ LOCALID_POKEDEX_2,       10
-
 .equ PLAYER_STARTER_NUM,      VAR_TEMP_1
 .equ PLAYER_STARTER_SPECIES,  VAR_TEMP_2
 .equ RIVAL_STARTER_SPECIES,   VAR_TEMP_3
@@ -36,14 +28,14 @@ PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished::
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene::
-	setobjectxyperm LOCALID_PROF_OAK, 6, 11
+	setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11
-	setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP
 	savebgm MUS_OAK
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene::
-	setobjectxyperm LOCALID_PROF_OAK, 6, 11
+	setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11
-	setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP
 	return
 
 PalletTown_ProfessorOaksLab_OnWarp::
@@ -51,7 +43,7 @@ PalletTown_ProfessorOaksLab_OnWarp::
 	.2byte 0
 
 PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 PalletTown_ProfessorOaksLab_OnFrame::
@@ -63,13 +55,13 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002
 	lockall
 	setvar VAR_FACING, DIR_NORTH
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
 	waitmovement 0
-	removeobject LOCALID_PROF_OAK
+	removeobject LOCALID_OAKS_LAB_PROF_OAK
-	setobjectxyperm LOCALID_PROF_OAK, 6, 3
+	setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3
-	setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
 	clearflag FLAG_HIDE_OAK_IN_HIS_LAB
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene
 	end
@@ -121,70 +113,70 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
 	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit
 	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
 	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	removeobject LOCALID_RIVAL
+	removeobject LOCALID_OAKS_LAB_RIVAL
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
 	releaseall
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth::
-	setobjectxyperm LOCALID_RIVAL, 5, 10
+	setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10
-	addobject LOCALID_RIVAL
+	addobject LOCALID_OAKS_LAB_RIVAL
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
-	setobjectxyperm LOCALID_RIVAL, 6, 10
+	setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
-	addobject LOCALID_RIVAL
+	addobject LOCALID_OAKS_LAB_RIVAL
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
-	setobjectxyperm LOCALID_RIVAL, 6, 10
+	setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
-	addobject LOCALID_RIVAL
+	addobject LOCALID_OAKS_LAB_RIVAL
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
-	waitmovement LOCALID_PROF_OAK
+	waitmovement LOCALID_OAKS_LAB_PROF_OAK
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
-	waitmovement LOCALID_PROF_OAK
+	waitmovement LOCALID_OAKS_LAB_PROF_OAK
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
 	waitmovement 0
 	return
 
@@ -207,15 +199,15 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth::
 PalletTown_ProfessorOaksLab_ChooseStarterScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
 	waitmovement 0
-	removeobject LOCALID_PROF_OAK
+	removeobject LOCALID_OAKS_LAB_PROF_OAK
-	setobjectxyperm LOCALID_PROF_OAK, 6, 3
+	setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3
-	setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
 	clearflag FLAG_HIDE_OAK_IN_HIS_LAB
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
 	waitmovement 0
-	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	clearflag FLAG_DONT_TRANSITION_MUSIC
 	savebgm MUS_DUMMY
@@ -226,7 +218,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
 	msgbox PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne
 	closemessage
 	delay 30
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact
 	waitmovement 0
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe
 	msgbox PalletTown_ProfessorOaksLab_Text_OakBePatientRival
@@ -262,11 +254,11 @@ PalletTown_ProfessorOaksLab_Movement_RivalReact::
 PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceDown
 	waitmovement 0
 	msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
 	waitmovement 0
 	releaseall
 	end
@@ -296,13 +288,13 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
 PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
 	textcolor NPC_TEXT_COLOR_MALE
 	playbgm MUS_ENCOUNTER_RIVAL, 0
-	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
 	closemessage
-	applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceDown
 	waitmovement 0
 	goto_if_eq VAR_STARTER_MON, 0, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
 	goto_if_eq VAR_STARTER_MON, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
@@ -320,19 +312,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
 	end
@@ -373,19 +365,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
 	end
@@ -429,19 +421,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
 	end
@@ -480,7 +472,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
 	call_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft
 	call_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid
 	call_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight
-	removeobject LOCALID_RIVAL
+	removeobject LOCALID_OAKS_LAB_RIVAL
 	playse SE_EXIT
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
@@ -489,21 +481,21 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
-	waitmovement LOCALID_RIVAL
+	waitmovement LOCALID_OAKS_LAB_RIVAL
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
-	waitmovement LOCALID_RIVAL
+	waitmovement LOCALID_OAKS_LAB_RIVAL
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
-	waitmovement LOCALID_RIVAL
+	waitmovement LOCALID_OAKS_LAB_RIVAL
 	return
 
 PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft::
@@ -625,9 +617,9 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	closemessage
 	delay 30
 	playse SE_PIN
-	applymovement LOCALID_PROF_OAK, Common_Movement_ExclamationMark
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_PROF_OAK, Common_Movement_Delay48
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_Delay48
 	waitmovement 0
 	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
 	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
@@ -644,7 +636,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	delay 40
 	msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou
 	closemessage
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	removeobject LOCALID_POKEDEX_1
 	delay 10
@@ -681,7 +673,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit
 	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
 	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
-	removeobject LOCALID_RIVAL
+	removeobject LOCALID_OAKS_LAB_RIVAL
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
 	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2
@@ -692,23 +684,23 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
 	waitmovement 0
 	return
 
@@ -729,25 +721,25 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth::
 	step_end
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
-	waitmovement LOCALID_PROF_OAK
+	waitmovement LOCALID_OAKS_LAB_PROF_OAK
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
-	waitmovement LOCALID_PROF_OAK
+	waitmovement LOCALID_OAKS_LAB_PROF_OAK
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
 	waitmovement 0
 	return
 
@@ -804,7 +796,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
 	call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
 	call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
 	call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
-	applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
 	waitmovement 0
 	closemessage
 	delay 70
@@ -814,22 +806,22 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest::
-	applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest
 	waitmovement 0
 	return
 
@@ -956,87 +948,87 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
-	setobjectxyperm LOCALID_RIVAL, 5, 10
+	setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10
-	addobject LOCALID_RIVAL
+	addobject LOCALID_OAKS_LAB_RIVAL
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
-	setobjectxyperm LOCALID_RIVAL, 6, 10
+	setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
-	addobject LOCALID_RIVAL
+	addobject LOCALID_OAKS_LAB_RIVAL
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth::
-	setobjectxyperm LOCALID_RIVAL, 6, 10
+	setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
-	addobject LOCALID_RIVAL
+	addobject LOCALID_OAKS_LAB_RIVAL
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth::
-	applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 15
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
-	applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 15
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
-	applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 15
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
-	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
+	applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_FacePlayer
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
-	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
-	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
+	applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_FacePlayer
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth::
-	applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
+	applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_RivalExit::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
 	waitmovement 0
 	return
 
 PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth::
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
@@ -1088,7 +1080,7 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice::
-	applymovement LOCALID_PROF_OAK, Common_Movement_FaceRight
+	applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceRight
 	waitmovement 0
 	showmonpic PLAYER_STARTER_SPECIES, 10, 3
 	textcolor NPC_TEXT_COLOR_MALE
@@ -1153,19 +1145,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter::
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
 	end
 
 PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur::
-	applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur
+	applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur
 	waitmovement 0
 	goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
 	end

data/maps/PalletTown_RivalsHouse/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_DAISY",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_DAISY",
       "x": 10,
@@ -30,6 +31,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_TOWN_MAP",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP",
       "x": 6,

data/maps/PalletTown_RivalsHouse/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_DAISY,    1
-.equ LOCALID_TOWN_MAP, 2
-
 .equ RECEIVED_TOWN_MAP, VAR_TEMP_1
 
 PalletTown_RivalsHouse_MapScripts::

data/maps/PewterCity/map.json

@@ -41,6 +41,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_PEWTER_MUSEUM_GUIDE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 33,
@@ -83,6 +84,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_PEWTER_GYM_GUIDE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 42,
@@ -111,6 +113,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
+      "local_id": "LOCALID_PEWTER_AIDE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 46,

data/maps/PewterCity/scripts.inc

@@ -1,7 +1,3 @@
-.equ LOCALID_MUSEUM_GUIDE, 2
-.equ LOCALID_GYM_GUIDE,    5
-.equ LOCALID_AIDE,         7
-
 PewterCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition
 	.byte 0
@@ -22,40 +18,40 @@ PewterCity_EventScript_GymGuide::
 	call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_WalkToGymEast
 	msgbox PewterCity_Text_GoTakeOnBrock
 	closemessage
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit
 	waitmovement 0
 	fadedefaultbgm
-	removeobject LOCALID_GYM_GUIDE
+	removeobject LOCALID_PEWTER_GYM_GUIDE
 	clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
 	release
 	end
 
 PewterCity_EventScript_WalkToGymEast::
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
 	waitmovement 0
 	return
 
 @ Unused
 PewterCity_EventScript_WalkToGymWest::
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
 	waitmovement 0
 	return
 
 @ Unused
 PewterCity_EventScript_WalkToGymNorth::
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
 	waitmovement 0
 	return
 
@@ -292,44 +288,44 @@ PewterCity_EventScript_GymGuideTrigger::
 	call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_WalkToGymBottom
 	msgbox PewterCity_Text_GoTakeOnBrock
 	closemessage
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit
 	waitmovement 0
 	fadedefaultbgm
-	removeobject LOCALID_GYM_GUIDE
+	removeobject LOCALID_PEWTER_GYM_GUIDE
 	clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
 	releaseall
 	end
 
 PewterCity_EventScript_WalkToGymTop::
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
 	waitmovement 0
 	return
 
 PewterCity_EventScript_WalkToGymMid::
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
 	waitmovement 0
 	return
 
 PewterCity_EventScript_WalkToGymBottom::
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
 	waitmovement 0
 	return
 
 @ Unused
 PewterCity_EventScript_WalkToGymRight::
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight
-	applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
+	applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
 	waitmovement 0
 	return
 
@@ -448,35 +444,35 @@ PewterCity_EventScript_MuseumGuide::
 	msgbox PewterCity_Text_ThisIsTheMuseum
 	closemessage
 	delay 10
-	applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit
+	applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit
 	waitmovement 0
 	fadedefaultbgm
-	removeobject LOCALID_MUSEUM_GUIDE
+	removeobject LOCALID_PEWTER_MUSEUM_GUIDE
 	clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE
 	release
 	end
 
 PewterCity_EventScript_LeadToMuseumNorth::
-	applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
+	applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth
 	waitmovement 0
 	return
 
 PewterCity_EventScript_LeadToMuseumSouth::
-	applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
+	applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth
 	waitmovement 0
 	return
 
 PewterCity_EventScript_LeadToMuseumWest::
-	applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
+	applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest
 	waitmovement 0
 	return
 
 PewterCity_EventScript_LeadToMuseumEast::
-	applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
+	applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast
+	applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast
 	waitmovement 0
 	return
 
@@ -691,9 +687,9 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer
 	waitse
 	playse SE_PIN
-	applymovement LOCALID_AIDE, Common_Movement_ExclamationMark
+	applymovement LOCALID_PEWTER_AIDE, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_AIDE, Common_Movement_Delay48
+	applymovement LOCALID_PEWTER_AIDE, Common_Movement_Delay48
 	waitmovement 0
 	msgbox PewterCity_Text_OhPlayer
 	call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0
@@ -722,13 +718,13 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox PewterCity_Text_RunningShoesLetterFromMom
 	closemessage
-	removeobject LOCALID_AIDE
+	removeobject LOCALID_PEWTER_AIDE
 	setflag FLAG_SYS_B_DASH
 	setvar VAR_MAP_SCENE_PEWTER_CITY, 2
 	return
 
 PewterCity_EventScript_AideNoticePlayer::
-	applymovement LOCALID_AIDE, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_PEWTER_AIDE, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
 
@@ -740,43 +736,43 @@ PewterCity_EventScript_AideApproachPlayer0::
 
 PewterCity_EventScript_AideApproachPlayer1::
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 PewterCity_EventScript_AideApproachPlayer2::
 	closemessage
-	applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid
+	applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerMid
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 PewterCity_EventScript_AideApproachPlayer3::
 	closemessage
-	applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom
+	applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerBottom
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 PewterCity_EventScript_AideExit0::
-	applymovement LOCALID_AIDE, PewterCity_Movement_AideExit0
+	applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit0
 	waitmovement 0
 	return
 
 PewterCity_EventScript_AideExit1::
-	applymovement LOCALID_AIDE, PewterCity_Movement_AideExit1
+	applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit1
 	waitmovement 0
 	return
 
 PewterCity_EventScript_AideExit2::
-	applymovement LOCALID_AIDE, PewterCity_Movement_AideExit2
+	applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit2
 	waitmovement 0
 	return
 
 PewterCity_EventScript_AideExit3::
-	applymovement LOCALID_AIDE, PewterCity_Movement_AideExit3
+	applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit3
 	waitmovement 0
 	return
 

data/maps/PewterCity_House1/map.json

@@ -44,6 +44,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_PEWTER_HOUSE_NIDORAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M",
       "x": 6,

data/maps/PewterCity_House1/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_NIDORAN, 3
-
 PewterCity_House1_MapScripts::
 	.byte 0
 
@@ -18,7 +16,7 @@ PewterCity_House1_EventScript_Nidoran::
 	lock
 	faceplayer
 	call PewterCity_House1_EventScript_DoNidoranCry
-	applymovement LOCALID_NIDORAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_PEWTER_HOUSE_NIDORAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/PewterCity_Museum_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_MUSEUM_SCIENTIST1",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 16,
@@ -58,6 +59,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_OLD_AMBER",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_AMBER",
       "x": 22,

data/maps/PewterCity_Museum_1F/scripts.inc

@@ -1,6 +1,3 @@
-.set LOCALID_SCIENTIST1, 1
-.set LOCALID_OLD_AMBER,  4
-
 PewterCity_Museum_1F_MapScripts::
 	.byte 0
 
@@ -22,14 +19,14 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter::
 
 PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter::
 	msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter
-	applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_MUSEUM_SCIENTIST1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 PewterCity_Museum_1F_EventScript_ExplainAmber::
 	msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap
-	applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_MUSEUM_SCIENTIST1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -37,7 +34,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber::
 PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
 	lockall
 	setvar VAR_TEMP_1, 0
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	goto PewterCity_Museum_1F_EventScript_EntranceTrigger
 	end
@@ -45,7 +42,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
 PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
 	lockall
 	setvar VAR_TEMP_1, 1
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	goto PewterCity_Museum_1F_EventScript_EntranceTrigger
 	end
@@ -53,7 +50,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
 PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
 	lockall
 	setvar VAR_TEMP_1, 2
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	goto PewterCity_Museum_1F_EventScript_EntranceTrigger
 	end
@@ -66,7 +63,7 @@ PewterCity_Museum_1F_EventScript_EntranceTrigger::
 	msgbox PewterCity_Museum_1F_Text_ComeAgain
 	closemessage
 	hidemoneybox
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
+	applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
 	waitmovement 0
 	releaseall
 	end
@@ -89,17 +86,17 @@ PewterCity_Museum_1F_EventScript_TryPayForTicket::
 	end
 
 PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft
+	applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft
 	waitmovement 0
 	return
 
 PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid::
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid
+	applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid
 	waitmovement 0
 	return
 
 PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight::
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight
+	applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight
 	waitmovement 0
 	return
 
@@ -107,7 +104,7 @@ PewterCity_Museum_1F_EventScript_NotEnoughMoney::
 	msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney
 	closemessage
 	hidemoneybox
-	applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
+	applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
 	waitmovement 0
 	releaseall
 	end

data/maps/PewterCity_PokemonCenter_1F/map.json

@@ -44,6 +44,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_PEWTER_NURSE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,

data/maps/PewterCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ PewterCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 PewterCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_PEWTER_CITY
+	setrespawn HEAL_LOCATION_PEWTER_CITY
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_Nurse::

data/maps/PokemonLeague_AgathasRoom/scripts.inc

@@ -28,7 +28,7 @@ PokemonLeague_AgathasRoom_OnWarp::
 	.2byte 0
 
 PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_AgathasRoom_OnFrame::

data/maps/PokemonLeague_BrunosRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_BRUNO",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BRUNO",
       "x": 6,

data/maps/PokemonLeague_BrunosRoom/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_BRUNO, 1
-
 PokemonLeague_BrunosRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad
@@ -30,7 +28,7 @@ PokemonLeague_BrunosRoom_OnWarp::
 	.2byte 0
 
 PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_BrunosRoom_OnFrame::

data/maps/PokemonLeague_ChampionsRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 6,
@@ -30,6 +31,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CHAMPIONS_ROOM_PROF_OAK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 6,

data/maps/PokemonLeague_ChampionsRoom/scripts.inc

@@ -1,6 +1,3 @@
-.equ LOCALID_RIVAL,    1
-.equ LOCALID_PROF_OAK, 2
-
 PokemonLeague_ChampionsRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp
 	map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume
@@ -39,7 +36,7 @@ PokemonLeague_ChampionsRoom_OnWarp::
 	.2byte 0
 
 PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_ChampionsRoom_OnFrame::
@@ -50,7 +47,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
 	setflag FLAG_TEMP_2
-	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
+	applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
 	waitmovement 0
 	delay 20
 	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_Intro
@@ -67,30 +64,30 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
 	setflag FLAG_TEMP_4
 	msgbox PokemonLeague_ChampionsRoom_Text_PostBattle
 	playbgm MUS_SLOW_PALLET, 0
-	addobject LOCALID_PROF_OAK
+	addobject LOCALID_CHAMPIONS_ROOM_PROF_OAK
 	msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
+	applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
-	applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
+	applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
-	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
+	applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
 	waitmovement 0
 	delay 25
 	specialvar VAR_RESULT, GetStarterSpecies
 	bufferspeciesname STR_VAR_1, VAR_RESULT
 	msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
-	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
 	closemessage
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	delay 20
 	msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
 	closemessage
 	delay 13
-	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
+	applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
-	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
+	applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 5, 12

data/maps/PokemonLeague_HallOfFame/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_HALL_OF_FAME_PROF_OAK",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 6,

data/maps/PokemonLeague_HallOfFame/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_PROF_OAK, 1
-
 PokemonLeague_HallOfFame_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp
@@ -10,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp::
 	.2byte 0
 
 PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth::
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	turnobject LOCALID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_HallOfFame_OnFrame::
@@ -20,16 +18,16 @@ PokemonLeague_HallOfFame_OnFrame::
 PokemonLeague_HallOfFame_EventScript_EnterRoom::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
+	applymovement LOCALID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
 	waitmovement 0
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_HALL_OF_FAME_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 18
 	msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
 	closemessage
-	applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_HALL_OF_FAME_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 20
 	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
@@ -37,7 +35,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom::
 	delay 40
 	setvar VAR_TEMP_1, 1
 	call EventScript_SetDefeatedEliteFourFlagsVars
-	setrespawn SPAWN_PALLET_TOWN
+	setrespawn HEAL_LOCATION_PALLET_TOWN
 	fadescreenspeed FADE_TO_BLACK, 24
 	special EnterHallOfFame
 	waitstate

data/maps/PokemonLeague_LancesRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "local_id": "LOCALID_LANCE",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LANCE",
       "x": 6,