diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 0135bc26df..142ad979d7 100644 --- a/asm/macros/event.inc +++ b/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 - @ is not currently being manipulated with applymovement, then this command does nothing. + @ If localId is LOCALID_NONE (0), then the id of the last-moved object will be used instead. + @ 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 diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 255ca46456..654ddfc1cd 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/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, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 9e9008b987..5bef2d0e9a 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/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(MAP_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 diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index d26338c286..2d329c4cb0 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/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", diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index d044943686..8639c573f3 100644 --- a/data/maps/CeladonCity/map.json +++ b/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, @@ -407,7 +409,7 @@ "x": 48, "y": 12, "respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_CELADON_NURSE" } ] } diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index adf2f5457c..901a7a392e 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/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 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 26d0871ed3..20405357bb 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/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, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 9463564e7e..72a109cc74 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_EEVEE_POKEBALL, 2 - CeladonCity_Condominiums_RoofRoom_MapScripts:: .byte 0 diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 51809f37c9..3d2a43c7f5 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/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, diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index c179330f28..dddd0aefab 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/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 @@ -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 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 6cf24c45c7..1beb9871f9 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index b94ba69a61..26f09531d4 100644 --- a/data/maps/CeruleanCity/map.json +++ b/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, @@ -171,6 +176,7 @@ "target_map": "MAP_ROUTE9" }, { + "local_id": "LOCALID_CERULEAN_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, @@ -420,7 +426,7 @@ "x": 22, "y": 20, "respawn_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_CERULEAN_NURSE" } ] } diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 3b1fc39481..0621f6e96b 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/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_SLOWBRO, 26, 31 - setobjectxyperm LOCALID_LASS, 27, 31 + setobjectxyperm LOCALID_CERULEAN_POLICEMAN, 30, 12 + setobjectxyperm LOCALID_CERULEAN_SLOWBRO, 26, 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 - applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter + addobject LOCALID_CERULEAN_RIVAL + 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 @@ -86,13 +79,13 @@ CeruleanCity_EventScript_RivalCharmander:: CeruleanCity_EventScript_RivalStartExit:: 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 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,7 +197,7 @@ 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 @@ -214,7 +207,7 @@ 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -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 diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 48fad54a7c..98ad025a6b 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/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, diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 42ddde3f20..afc16684be 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/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 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 0744442483..98ef71cd01 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 5c46e56381..e152453095 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/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, @@ -171,7 +173,7 @@ "x": 14, "y": 12, "respawn_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_CINNABAR_NURSE" } ] } diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 99ae7bd08b..3df941f11b 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/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 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT - setobjectxyperm LOCALID_SEAGALLOP, 30, 12 + setobjectxyperm LOCALID_CINNABAR_BILL, 15, 12 + setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_LEFT + 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 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP - setobjectxyperm LOCALID_SEAGALLOP, 30, 12 + setobjectxyperm LOCALID_CINNABAR_BILL, 18, 12 + setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP + 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 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_CINNABAR_BILL, 21, 8 + 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,22 +104,22 @@ 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -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 @@ -163,11 +160,11 @@ CinnabarIsland_Movement_BillExitToPokeCenter:: CinnabarIsland_EventScript_BillReturnToPokeCenter:: 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,30 +208,30 @@ CinnabarIsland_EventScript_SailToOneIsland:: end CinnabarIsland_EventScript_ApproachShore:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_ApproachShore applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ApproachShore waitmovement 0 return CinnabarIsland_EventScript_BoatArrive:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat - applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillFaceBoat + 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 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 LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore waitmovement 0 return diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 0a1fa5e2e0..ba4ec7d863 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/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, diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 8e09bcb5a6..b160155e0d 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/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 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 9491f5f434..a89d9c479c 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index ec83ca92f4..bb7f622bdb 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.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 @@ -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,19 +50,19 @@ 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 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 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 LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest waitmovement 0 return diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 638e35a9f4..826d5dd23f 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -110,7 +110,7 @@ "x": 18, "y": 7, "respawn_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_FIVE_ISLAND_NURSE" } ] } diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index d7b55d659e..55d7ceb1b4 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/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, diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 646136ff4f..1ead85aa03 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/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 diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 73c15634ad..b49632264a 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/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, diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 3c4ba29592..42ba87e91a 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_MEMORIAL_MAN, 1 - FiveIsland_MemorialPillar_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 7d8d75de38..530899734b 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 80ddcafab0..1904347712 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/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, diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 21a30078fd..df2b867b84 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/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 @@ -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 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index bec5ba7458..cf910dc53c 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/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, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 9a62394de6..32ec5021cd 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/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 - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter + addobject LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER + 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_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: - applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 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 diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 63a27af82e..876cb157b8 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/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, diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index beb9a18ce9..846909f0ca 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/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_GRUNT3 - removeobject LOCALID_ADMIN2 - removeobject LOCALID_ADMIN1 + removeobject LOCALID_WAREHOUSE_GRUNT2 + removeobject LOCALID_WAREHOUSE_GRUNT3 + removeobject LOCALID_WAREHOUSE_ADMIN2 + removeobject LOCALID_WAREHOUSE_ADMIN1 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 @@ -143,27 +137,27 @@ FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: 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 diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 51c0ba569e..ae8ab6a8a2 100644 --- a/data/maps/FourIsland/map.json +++ b/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, @@ -287,7 +289,7 @@ "x": 18, "y": 21, "respawn_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_FOUR_ISLAND_NURSE" } ] } diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 563e961ecf..9abec8cad0 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/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 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 diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 70e18a4c34..7f456810b8 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/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, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index be6cb7c39d..8bcf653bdc 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/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, diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index fd644a9de4..07fa58a3da 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/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_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets + applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei + applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets 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,22 +59,22 @@ 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 LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit - applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit - applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit - applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit + applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit + applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit + applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit waitmovement 0 - removeobject LOCALID_ROCKET1 - removeobject LOCALID_ROCKET2 - removeobject LOCALID_ROCKET3 + removeobject LOCALID_ICEFALL_ROCKET1 + removeobject LOCALID_ICEFALL_ROCKET2 + 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index c6e9f2abae..8956a19b21 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 380c5574db..e2314d3136 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/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, diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index fb2a1fbc7f..2ecd7d4814 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/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 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index e0c4306fc9..da21cc7348 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -442,7 +442,7 @@ "x": 25, "y": 32, "respawn_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_FUCHSIA_NURSE" } ] } diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 9d1b7c252e..ef8fe462c2 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 345f71005e..cab346b545 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/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, @@ -67,7 +69,7 @@ "x": 11, "y": 7, "respawn_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", - "respawn_npc": 2 + "respawn_npc": "LOCALID_LEAGUE_NURSE" } ] } diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index f5f7e02880..b2291ca776 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/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,8 +29,8 @@ IndigoPlateau_Exterior_EventScript_Credits:: opendoor 11, 6 waitdooranim special SpawnCameraObject - addobject LOCALID_RIVAL - applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding + addobject LOCALID_CREDITS_RIVAL + applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay waitmovement 0 closedoor 11, 6 @@ -41,15 +38,15 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ Rival runs off 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 - applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding + addobject LOCALID_CREDITS_PROF_OAK + applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding waitmovement 0 closedoor 11, 6 waitdooranim @@ -57,7 +54,7 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ Oak looks at player, then walks off 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 @@ -78,8 +75,8 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ Reset the map state and roll the credits special RemoveCameraObject setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 - removeobject LOCALID_RIVAL - removeobject LOCALID_PROF_OAK + removeobject LOCALID_CREDITS_RIVAL + removeobject LOCALID_CREDITS_PROF_OAK special DoCredits waitstate releaseall diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 7955bd1cd5..88f8487a9c 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index bc53f0fd66..6b0120cf9d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.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 @@ -13,7 +11,7 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: 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:: diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 0c44605b3e..9b3316e1a0 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -159,7 +159,7 @@ "x": 6, "y": 6, "respawn_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_LAVENDER_NURSE" } ] } diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 055802ae6d..1c1c56edc5 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index a755bbd0b7..e92128251a 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/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, diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 6bfe3cbfa8..fb8c5392f8 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/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_GRUNT2, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_MT_EMBER_GRUNT1, 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_GRUNT2 + removeobject LOCALID_MT_EMBER_GRUNT1 + 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 diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 87a8127080..ba1e1f2225 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/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, diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 5a1751eb9f..949e17660c 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RUBY, 1 - MtEmber_RubyPath_B3F_MapScripts:: .byte 0 diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 259a6ed507..f1e0129d27 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/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, diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index d69d69d969..2cd079852d 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/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 diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index faa3eef81d..feabdef643 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/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, diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 4919a5ac4f..9984658a77 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/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:: diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 64eb420c58..582e51e108 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/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, diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 1d04d8fbec..7dd3f0e947 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/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,7 +39,7 @@ 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 LOCALID_CAMERA, Movement_CameraPanUp waitmovement 0 delay 50 @@ -56,7 +54,7 @@ NavelRock_Summit_EventScript_HoOh:: setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound 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 diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index b1c9a82096..eb741c1f20 100644 --- a/data/maps/OneIsland/map.json +++ b/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, @@ -124,7 +125,7 @@ "x": 14, "y": 6, "respawn_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_ONE_ISLAND_NURSE" } ] } diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 62285c0e16..6afd7cd76f 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/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 @@ -20,17 +18,17 @@ OneIsland_EventScript_EnterOneIslandFirstTime:: waitmovement 0 msgbox OneIsland_Text_BillLetsGoSeeCelio closemessage - applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter + applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillWalkToPokeCenter 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 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 diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 98c9bb5855..d5a27329a9 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index d2c6bbeff6..7ee71de1a9 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/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 @@ -39,15 +36,15 @@ OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone:: return OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos:: - setobjectxyperm LOCALID_BILL, 9, 8 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 9, 8 + 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 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 14, 7 + setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_LEFT setobjectxyperm LOCALID_CELIO, 14, 8 setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT return @@ -60,7 +57,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: lockall textcolor NPC_TEXT_COLOR_MALE 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight @@ -74,11 +71,11 @@ 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 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -92,10 +89,10 @@ 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -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 @@ -453,14 +450,14 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight @@ -468,7 +465,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: 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 @@ -479,7 +476,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: closemessage delay 25 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 diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index c0a6ff39e2..d9b8e59290 100644 --- a/data/maps/PalletTown/map.json +++ b/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, @@ -55,6 +56,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PALLET_PROF_OAK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 10, @@ -169,7 +171,7 @@ "x": 6, "y": 8, "respawn_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_MOM" } ] } diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 39712b9796..1384b7d6c6 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/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 - setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_PALLET_SIGN_LADY, 5, 15 + setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_UP return PalletTown_EventScript_MoveSignLadyToRouteEntrance:: - setobjectxyperm LOCALID_SIGN_LADY, 12, 2 - setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_PALLET_SIGN_LADY, 12, 2 + 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 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT - addobject LOCALID_PROF_OAK - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor + setobjectxyperm LOCALID_PALLET_PROF_OAK, 14, 14 + setobjectmovementtype LOCALID_PALLET_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT + addobject LOCALID_PALLET_PROF_OAK + 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 @@ -63,11 +60,11 @@ PalletTown_EventScript_OakRatingScene:: closemessage playbgm MUS_FOLLOW_ME, 0 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 LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 @@ -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 @@ -196,7 +193,7 @@ PalletTown_EventScript_OakTrigger:: 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,7 +204,7 @@ 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 LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 @@ -223,23 +220,23 @@ 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 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 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,7 +418,7 @@ PalletTown_EventScript_TrainerTips:: PalletTown_EventScript_SignLadyTrigger:: lockall - applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 call PalletTown_EventScript_SignLadyShowSign @@ -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 diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index a03192be5a..2643219a59 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/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, diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index a5a7b35bb1..889472d3c8 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_MOM, 1 - PalletTown_PlayersHouse_1F_MapScripts:: .byte 0 diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ddbc3e3e2a..be72653587 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/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, diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 7ff01bb4e3..90adf867df 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/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 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP savebgm MUS_OAK return PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: - setobjectxyperm LOCALID_PROF_OAK, 6, 11 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP return PalletTown_ProfessorOaksLab_OnWarp:: @@ -63,11 +55,11 @@ 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 - setobjectxyperm LOCALID_PROF_OAK, 6, 3 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN + removeobject LOCALID_OAKS_LAB_PROF_OAK + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 @@ -121,37 +113,37 @@ 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 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10 + addobject LOCALID_OAKS_LAB_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 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 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + 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_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 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return @@ -166,25 +158,25 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: 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 LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - waitmovement LOCALID_PROF_OAK + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + 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 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 - setobjectxyperm LOCALID_PROF_OAK, 6, 3 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN + removeobject LOCALID_OAKS_LAB_PROF_OAK + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB 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,7 +254,7 @@ 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 @@ -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 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 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 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 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 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 LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - waitmovement LOCALID_PROF_OAK + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + 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 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,82 +948,82 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: end PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: - setobjectxyperm LOCALID_RIVAL, 5, 10 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10 + addobject LOCALID_OAKS_LAB_RIVAL 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 - addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown 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 - addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + 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 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 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 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 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: 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 @@ -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 diff --git a/data/maps/PalletTown_RivalsHouse/map.json b/data/maps/PalletTown_RivalsHouse/map.json index ad9b2880de..d3efdba831 100644 --- a/data/maps/PalletTown_RivalsHouse/map.json +++ b/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, diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc index 1f0fd33814..a9e5e29b85 100644 --- a/data/maps/PalletTown_RivalsHouse/scripts.inc +++ b/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:: diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index bed0b16ca1..c5df180ee1 100644 --- a/data/maps/PewterCity/map.json +++ b/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, @@ -299,7 +302,7 @@ "x": 17, "y": 26, "respawn_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", - "respawn_npc": 3 + "respawn_npc": "LOCALID_PEWTER_NURSE" } ] } diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 2a37d4421d..5b0f1b65fc 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/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 LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast waitmovement 0 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 LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest waitmovement 0 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 LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth waitmovement 0 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 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 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 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 LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight waitmovement 0 return @@ -448,34 +444,34 @@ 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 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 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 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 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 @@ -746,7 +742,7 @@ PewterCity_EventScript_AideApproachPlayer1:: PewterCity_EventScript_AideApproachPlayer2:: closemessage - applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerMid waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -754,29 +750,29 @@ PewterCity_EventScript_AideApproachPlayer2:: PewterCity_EventScript_AideApproachPlayer3:: closemessage - applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerBottom waitmovement 0 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 diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 097a58484e..c578a35411 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/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, diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index d4dfee4e86..cbdb3294f6 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/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 diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 530760e181..13d818f119 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/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, diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index dcf9f81ab5..e7688179f6 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/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 diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index d8840a13ba..28789f97ba 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/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, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 3150972aca..e3d4a1af55 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/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, diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 7d4fb5d55a..1e71f2edef 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/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 diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 32329b02de..ee7b8082ed 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/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, diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 5540d8423b..a3c532d6ed 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/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 @@ -67,29 +64,29 @@ 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 LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter - applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter - applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter + 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_RIVAL, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterRight + 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 LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit waitmovement 0 setvar VAR_TEMP_1, 1 diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index e728c6554e..8144361695 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/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, diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index a75e8037a2..1b2431bc0a 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/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 @@ -22,13 +20,13 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: textcolor NPC_TEXT_COLOR_MALE 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 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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 4a1dde3366..d9685ace29 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/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, diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 8c8b634bb7..6d31155e71 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LANCE, 1 - PokemonLeague_LancesRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 05e924e0f2..c7828a303e 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_POKEMON_TOWER_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 16, diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index bc397b26cc..01e4010016 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - PokemonTower_2F_MapScripts:: .byte 0 @@ -24,12 +22,12 @@ PokemonTower_2F_EventScript_Rival:: playbgm MUS_ENCOUNTER_RIVAL, 0 call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalFacePlayerRight call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalFacePlayerDown - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_Delay48 waitmovement 0 msgbox PokemonTower_2F_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_POKEMON_TOWER_RIVAL call_if_eq VAR_STARTER_MON, 2, PokemonTower_2F_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, PokemonTower_2F_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, PokemonTower_2F_EventScript_RivalCharmander @@ -41,19 +39,19 @@ PokemonTower_2F_EventScript_Rival:: playse SE_EXIT delay 25 fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_POKEMON_TOWER_RIVAL setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1 releaseall end PokemonTower_2F_EventScript_RivalFacePlayerRight:: - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PokemonTower_2F_EventScript_RivalFacePlayerDown:: - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -71,12 +69,12 @@ PokemonTower_2F_EventScript_RivalCharmander:: return PokemonTower_2F_EventScript_RivalExitRight:: - applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitRight + applymovement LOCALID_POKEMON_TOWER_RIVAL, PokemonTower_2F_Movement_RivalExitRight waitmovement 0 return PokemonTower_2F_EventScript_RivalExitDown:: - applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitDown + applymovement LOCALID_POKEMON_TOWER_RIVAL, PokemonTower_2F_Movement_RivalExitDown waitmovement 0 return diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 75a293e4b0..afda482b4b 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { + "local_id": "LOCALID_POKEMON_TOWER_GRUNT1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, @@ -44,6 +45,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { + "local_id": "LOCALID_POKEMON_TOWER_GRUNT2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, @@ -58,6 +60,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { + "local_id": "LOCALID_POKEMON_TOWER_GRUNT3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index f3a4d9b8ec..616225564c 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_GRUNT1, 2 -.set LOCALID_GRUNT2, 3 -.set LOCALID_GRUNT3, 4 - PokemonTower_7F_MapScripts:: .byte 0 @@ -31,25 +27,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt1:: goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt1ExitMid goto_if_eq VAR_0x8004, 11, PokemonTower_7F_EventScript_Grunt1ExitRight goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt1ExitLeft - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitMid:: - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitRight:: - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitLeft:: - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 playse SE_EXIT delay 25 @@ -57,7 +53,7 @@ PokemonTower_7F_EventScript_Grunt1ExitLeft:: end PokemonTower_7F_EventScript_RemoveGrunt1:: - removeobject LOCALID_GRUNT1 + removeobject LOCALID_POKEMON_TOWER_GRUNT1 release end @@ -115,25 +111,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt2:: getplayerxy VAR_0x8004, VAR_0x8005 goto_if_eq VAR_0x8004, 12, PokemonTower_7F_EventScript_Grunt2ExitLeft goto_if_eq VAR_0x8004, 13, PokemonTower_7F_EventScript_Grunt2ExitRight - applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit + applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_Grunt2ExitLeft:: - applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft + applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_Grunt2ExitRight:: - applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight + applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_RemoveGrunt2:: - removeobject LOCALID_GRUNT2 + removeobject LOCALID_POKEMON_TOWER_GRUNT2 release end @@ -178,25 +174,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt3:: getplayerxy VAR_0x8004, VAR_0x8005 goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt3ExitRight goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt3ExitLeft - applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit + applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_Grunt3ExitRight:: - applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight + applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_Grunt3ExitLeft:: - applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft + applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_RemoveGrunt3:: - removeobject LOCALID_GRUNT3 + removeobject LOCALID_POKEMON_TOWER_GRUNT3 release end diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 8ad0ad4e7a..5c2631279e 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_HIDEOUT_GIOVANNI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 19, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { + "local_id": "LOCALID_SILPH_SCOPE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, @@ -58,6 +60,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "local_id": "LOCALID_LIFT_KEY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 7d0c50b98a..54cda4f482 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,7 +1,3 @@ -.equ LOCALID_GIOVANNI, 1 -.equ LOCALID_SILPH_SCOPE, 2 -.equ LOCALID_LIFT_KEY, 4 - .equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1 RocketHideout_B4F_MapScripts:: @@ -31,7 +27,7 @@ RocketHideout_B4F_EventScript_Giovanni:: msgbox RocketHideout_B4F_Text_GiovanniPostBattle fadescreen FADE_TO_BLACK closemessage - removeobject LOCALID_GIOVANNI + removeobject LOCALID_HIDEOUT_GIOVANNI addobject LOCALID_SILPH_SCOPE clearflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CELADON_ROCKETS diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index dd4ad7950c..4d8fc826d9 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -287,7 +287,7 @@ "x": 13, "y": 21, "respawn_map": "MAP_ROUTE10_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_ROUTE10_NURSE" } ] } diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index a49cb927d1..1e86ed1e1a 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ROUTE10_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index ee918e6fa1..6da244d408 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE22_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 25, diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index a673210a50..365f88d430 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - Route22_MapScripts:: .byte 0 @@ -12,21 +10,21 @@ Route22_EventScript_EarlyRivalTriggerTop:: Route22_EventScript_EarlyRivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end Route22_EventScript_EarlyRivalTriggerBottom:: lockall setvar VAR_TEMP_1, 2 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end Route22_EventScript_EarlyRival:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL + addobject LOCALID_ROUTE22_RIVAL call_if_eq VAR_TEMP_1, 0, Route22_EventScript_EarlyRivalApproach call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalApproach call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalApproachBottom @@ -43,18 +41,18 @@ Route22_EventScript_EarlyRival:: call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalExit call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalExitBottom fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_ROUTE22_RIVAL setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end Route22_EventScript_EarlyRivalApproach:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return Route22_EventScript_EarlyRivalApproachBottom:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproachBottom applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return @@ -72,12 +70,12 @@ Route22_EventScript_EarlyRivalCharmander:: return Route22_EventScript_EarlyRivalExit:: - applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExit + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_EarlyRivalExit waitmovement 0 return Route22_EventScript_EarlyRivalExitBottom:: - applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExitBottom + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_EarlyRivalExitBottom waitmovement 0 return @@ -163,26 +161,26 @@ Route22_EventScript_LateRivalTriggerTop:: Route22_EventScript_LateRivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_LateRival end Route22_EventScript_LateRivalTriggerBottom:: lockall setvar VAR_TEMP_1, 2 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_LateRival end Route22_EventScript_LateRival:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL + addobject LOCALID_ROUTE22_RIVAL call_if_eq VAR_TEMP_1, 0, Route22_EventScript_LateRivalApproach call_if_eq VAR_TEMP_1, 1, Route22_EventScript_LateRivalApproach call_if_eq VAR_TEMP_1, 2, Route22_EventScript_LateRivalApproachBottom msgbox Route22_Text_LateRivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_ROUTE22_RIVAL call_if_eq VAR_STARTER_MON, 2, Route22_EventScript_LateRivalSquirtle call_if_eq VAR_STARTER_MON, 1, Route22_EventScript_LateRivalBulbasaur call_if_eq VAR_STARTER_MON, 0, Route22_EventScript_LateRivalCharmander @@ -190,21 +188,21 @@ Route22_EventScript_LateRival:: closemessage delay 10 playbgm MUS_RIVAL_EXIT, 0 - applymovement LOCALID_RIVAL, Route22_Movement_LateRivalExit + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_ROUTE22_RIVAL setvar VAR_MAP_SCENE_ROUTE22, 4 releaseall end Route22_EventScript_LateRivalApproach:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return Route22_EventScript_LateRivalApproachBottom:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproachBottom applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 7cbf5ed4e3..9371d9ffa6 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_CASCADE_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 15, @@ -41,6 +42,7 @@ "flag": "0" }, { + "local_id": "LOCALID_THUNDER_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, @@ -55,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RAINBOW_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, @@ -69,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOUL_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 16, @@ -83,6 +87,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MARSH_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 10, @@ -97,6 +102,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VOLCANO_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, @@ -111,6 +117,7 @@ "flag": "0" }, { + "local_id": "LOCALID_EARTH_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 03d576bc1b..d3912a16f1 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,11 +1,3 @@ -.set LOCALID_CASCADE_BADGE_GUARD, 1 -.set LOCALID_THUNDER_BADGE_GUARD, 2 -.set LOCALID_RAINBOW_BADGE_GUARD, 3 -.set LOCALID_SOUL_BADGE_GUARD, 4 -.set LOCALID_MARSH_BADGE_GUARD, 5 -.set LOCALID_VOLCANO_BADGE_GUARD, 6 -.set LOCALID_EARTH_BADGE_GUARD, 7 - Route23_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 0e8fd736f5..83f1aefbb0 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE24_ROCKET", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 0351e77d70..3a7a74bd0c 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_ROCKET, 1 - Route24_MapScripts:: .byte 0 @@ -55,19 +53,19 @@ Route24_EventScript_BattleRocket:: waitmessage playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress - setvar VAR_LAST_TALKED, LOCALID_ROCKET + setvar VAR_LAST_TALKED, LOCALID_ROUTE24_ROCKET trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat msgbox Route24_Text_YoudBecomeTopRocketLeader setvar VAR_MAP_SCENE_ROUTE24, 1 return Route24_EventScript_RocketApproachPlayer:: - applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer + applymovement LOCALID_ROUTE24_ROCKET, Route24_Movement_RocketApproachPlayer waitmovement 0 return Route24_EventScript_RocketMotionToPlayer:: - applymovement LOCALID_ROCKET, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ROUTE24_ROCKET, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -81,7 +79,7 @@ Route24_EventScript_NoRoomForNuggetTrigger:: end Route24_EventScript_RocketWalkBackToPos:: - applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos + applymovement LOCALID_ROUTE24_ROCKET, Route24_Movement_RocketWalkBackToPos waitmovement 0 return diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 82dd504029..1bf5ab9701 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BILL_HUMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 7, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { + "local_id": "LOCALID_BILL_CLEFAIRY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 10, diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 39e7dfdc22..b4eb77a2f8 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_BILL_HUMAN, 1 -.equ LOCALID_BILL_CLEFAIRY, 2 - .equ BILL_IN_TELEPORTER, FLAG_TEMP_2 .equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3 diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 2165112f6f..e2f670a28e 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -197,7 +197,7 @@ "x": 12, "y": 6, "respawn_map": "MAP_ROUTE4_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_ROUTE4_NURSE" } ] } diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 52cf73b1d2..ab3235ecf8 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ROUTE4_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 90934647d7..56a20bb69d 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_ANNE_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 30, diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 2010714105..280960b9b4 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - SSAnne_2F_Corridor_MapScripts:: .byte 0 @@ -26,16 +24,16 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: playse SE_EXIT delay 5 playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL + addobject LOCALID_SS_ANNE_RIVAL delay 10 - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SS_ANNE_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalApproachLeft call_if_eq VAR_TEMP_1, 1, SSAnne_2F_Corridor_EventScript_RivalApproachMid call_if_eq VAR_TEMP_1, 2, SSAnne_2F_Corridor_EventScript_RivalApproachRight msgbox SSAnne_2F_Corridor_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_SS_ANNE_RIVAL call_if_eq VAR_STARTER_MON, 2, SSAnne_2F_Corridor_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, SSAnne_2F_Corridor_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, SSAnne_2F_Corridor_EventScript_RivalCharmander @@ -47,25 +45,25 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: call_if_eq VAR_TEMP_1, 1, SSAnne_2F_Corridor_EventScript_RivalExitMid call_if_eq VAR_TEMP_1, 2, SSAnne_2F_Corridor_EventScript_RivalExitRight fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_SS_ANNE_RIVAL setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 releaseall end SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalApproachMid:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid applymovement LOCALID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalApproachRight:: applymovement LOCALID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight waitmovement 0 return @@ -82,17 +80,17 @@ SSAnne_2F_Corridor_EventScript_RivalCharmander:: return SSAnne_2F_Corridor_EventScript_RivalExitLeft:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalExitMid:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalExitRight:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight waitmovement 0 return diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 4282796c7c..9d7417e62f 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_ANNE_CAPTAIN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAPTAIN", "x": 5, diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 6ac9cb6931..1a18816a0c 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_CAPTAIN, 1 - SSAnne_CaptainsOffice_MapScripts:: .byte 0 @@ -14,7 +12,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: waitfanfare call EventScript_RestorePrevTextColor delay 50 - applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer + applymovement LOCALID_SS_ANNE_CAPTAIN, Common_Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM @@ -28,13 +26,13 @@ SSAnne_CaptainsOffice_EventScript_Captain:: SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis closemessage - applymovement LOCALID_CAPTAIN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SS_ANNE_CAPTAIN, Common_Movement_FaceOriginalDirection waitmovement 0 release end SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: - applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer + applymovement LOCALID_SS_ANNE_CAPTAIN, Common_Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon release diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index c8b5634716..1402b88337 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_ANNE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SS_ANNE", "x": 30, diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 367861fa1b..4f6d2fd0a3 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_SS_ANNE, 1 - SSAnne_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index d335da517d..bbdb3a27ff 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -108,6 +108,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "local_id": "LOCALID_SAFFRON_DOOR_GUARD_GRUNT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 34, @@ -436,7 +437,7 @@ "x": 24, "y": 39, "respawn_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_SAFFRON_NURSE" } ] } diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 3d517bf431..b2950a4dfa 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_DOOR_GUARD_GRUNT, 6 - SaffronCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 @@ -10,7 +8,7 @@ SaffronCity_OnTransition:: end SaffronCity_EventScript_MoveDoorGuardGrunt:: - setobjectxyperm LOCALID_DOOR_GUARD_GRUNT, 33, 31 + setobjectxyperm LOCALID_SAFFRON_DOOR_GUARD_GRUNT, 33, 31 return SaffronCity_EventScript_RocketGrunt1:: @@ -44,7 +42,7 @@ SaffronCity_EventScript_RocketGrunt7:: SaffronCity_EventScript_DoorGuardGrunt:: lock goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep - applymovement LOCALID_DOOR_GUARD_GRUNT, Common_Movement_FacePlayer + applymovement LOCALID_SAFFRON_DOOR_GUARD_GRUNT, Common_Movement_FacePlayer waitmovement 0 msgbox SaffronCity_Text_ImASecurityGuard release diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 062741bfa4..1575a3c0b3 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -72,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_KARATE_MASTER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index b66ad6cee9..852552208c 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_KARATE_MASTER, 5 - SaffronCity_Dojo_MapScripts:: .byte 0 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index dfb7b03be1..429e53776e 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SAFFRON_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 02db9fdb54..a1f3687f62 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, @@ -44,6 +46,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_YOUNGSTER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, @@ -58,6 +61,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_GENTLEMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, @@ -72,6 +76,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, @@ -86,6 +91,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_ROCKER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, @@ -100,6 +106,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_BEAUTY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, @@ -114,6 +121,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_BLACK_BELT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 5, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 2c1122c0bd..76b0ace0fb 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,12 +1,3 @@ -.set LOCALID_BATTLE_GIRL, 1 -.set LOCALID_LITTLE_GIRL, 2 -.set LOCALID_YOUNGSTER, 3 -.set LOCALID_GENTLEMAN, 4 -.set LOCALID_WOMAN, 5 -.set LOCALID_ROCKER, 6 -.set LOCALID_BEAUTY, 7 -.set LOCALID_BLACK_BELT, 8 - SaffronCity_PokemonTrainerFanClub_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition @@ -19,16 +10,16 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement LOCALID_BATTLE_GIRL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_BATTLE_GIRL, Common_Movement_ExclamationMark + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_BATTLE_GIRL, Common_Movement_Delay48 + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, Common_Movement_Delay48 waitmovement 0 msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou closemessage - applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -117,43 +108,43 @@ SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: end SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: - setobjectxyperm LOCALID_BATTLE_GIRL, 5, 2 - setobjectmovementtype LOCALID_BATTLE_GIRL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, 5, 2 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: - setobjectxyperm LOCALID_YOUNGSTER, 7, 4 - setobjectmovementtype LOCALID_YOUNGSTER, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_YOUNGSTER, 7, 4 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_YOUNGSTER, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: - setobjectxyperm LOCALID_GENTLEMAN, 2, 2 - setobjectmovementtype LOCALID_GENTLEMAN, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_GENTLEMAN, 2, 2 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_GENTLEMAN, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: - setobjectxyperm LOCALID_LITTLE_GIRL, 3, 4 - setobjectmovementtype LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, 3, 4 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, MOVEMENT_TYPE_FACE_RIGHT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: - setobjectxyperm LOCALID_ROCKER, 4, 6 - setobjectmovementtype LOCALID_ROCKER, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_ROCKER, 4, 6 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_ROCKER, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: - setobjectxyperm LOCALID_WOMAN, 10, 3 - setobjectmovementtype LOCALID_WOMAN, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_WOMAN, 10, 3 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_WOMAN, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: - setobjectxyperm LOCALID_BEAUTY, 7, 5 - setobjectmovementtype LOCALID_BEAUTY, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_BEAUTY, 7, 5 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_BEAUTY, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: - setobjectxyperm LOCALID_BLACK_BELT, 9, 6 - setobjectmovementtype LOCALID_BLACK_BELT, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_BLACK_BELT, 9, 6 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_BLACK_BELT, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index c1a54814d7..14208e2c48 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -116,7 +116,7 @@ "x": 12, "y": 4, "respawn_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_SEVEN_ISLAND_NURSE" } ] } diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 4204f18110..1222c11c6d 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 4, diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 11e2069ac9..5e7ce493bd 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_OLD_WOMAN, 1 - .equ TRAINER_VISITING, VAR_TEMP_1 SevenIsland_House_Room1_MapScripts:: @@ -15,14 +13,14 @@ SevenIsland_House_Room1_OnTransition:: SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: setvar TRAINER_VISITING, TRUE - setobjectxyperm LOCALID_OLD_WOMAN, 4, 2 - setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, 4, 2 + setobjectmovementtype LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN return SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: - setobjectxyperm LOCALID_OLD_WOMAN, 3, 2 - setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, 3, 2 + setobjectmovementtype LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT return SevenIsland_House_Room1_OnFrame:: @@ -36,9 +34,9 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: textcolor NPC_TEXT_COLOR_FEMALE applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom waitmovement 0 - applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer + applymovement LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer waitmovement 0 - copyobjectxytoperm LOCALID_OLD_WOMAN + copyobjectxytoperm LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_BattleWonComment diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 010db8bec5..33d0e44236 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SEVEN_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index e5e14894ae..df5d6cf6f8 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CHANSEY_DANCE_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, @@ -26,7 +27,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SevenIsland_SevaultCanyon_House_EventScript_BaldingMan", + "script": "SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan", "flag": "0" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 7f2e1c6a78..52387c4536 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -1,17 +1,17 @@ -.set LOCALID_BALDING_MAN, 1 +.set DID_CHANSEY_DANCE, FLAG_TEMP_2 SevenIsland_SevaultCanyon_House_MapScripts:: .byte 0 -SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: +SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan:: lock - goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced + goto_if_set DID_CHANSEY_DANCE, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced playbgm MUS_SCHOOL, 0 - applymovement LOCALID_BALDING_MAN, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance + applymovement LOCALID_CHANSEY_DANCE_MAN, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm delay 30 - applymovement LOCALID_BALDING_MAN, Common_Movement_FacePlayer + applymovement LOCALID_CHANSEY_DANCE_MAN, Common_Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn textcolor NPC_TEXT_COLOR_NEUTRAL @@ -29,7 +29,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: delay 30 call EventScript_OutOfCenterPartyHeal msgbox SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow - setflag FLAG_TEMP_2 + setflag DID_CHANSEY_DANCE release end @@ -39,7 +39,7 @@ SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: return SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: - applymovement LOCALID_BALDING_MAN, Common_Movement_FacePlayer + applymovement LOCALID_CHANSEY_DANCE_MAN, Common_Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn release diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 639d495cb0..811e146ee4 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TANOBY_KEY_BOULDER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, @@ -44,6 +46,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, @@ -58,6 +61,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER4", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, @@ -72,6 +76,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER5", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, @@ -86,6 +91,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER6", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, @@ -100,6 +106,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER7", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index d2d059ac13..55777e307f 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,11 +1,3 @@ -.set LOCALID_BOULDER1, 1 -.set LOCALID_BOULDER2, 2 -.set LOCALID_BOULDER3, 3 -.set LOCALID_BOULDER4, 4 -.set LOCALID_BOULDER5, 5 -.set LOCALID_BOULDER6, 6 -.set LOCALID_BOULDER7, 7 - .equ NUM_SWITCHES_PRESSED, VAR_TEMP_8 SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @@ -26,13 +18,13 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: end SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: - setobjectxyperm LOCALID_BOULDER1, 7, 2 - setobjectxyperm LOCALID_BOULDER2, 4, 4 - setobjectxyperm LOCALID_BOULDER3, 10, 4 - setobjectxyperm LOCALID_BOULDER4, 5, 6 - setobjectxyperm LOCALID_BOULDER5, 9, 6 - setobjectxyperm LOCALID_BOULDER6, 5, 8 - setobjectxyperm LOCALID_BOULDER7, 9, 8 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER1, 7, 2 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER2, 4, 4 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER3, 10, 4 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER4, 5, 6 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER5, 9, 6 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER6, 5, 8 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER7, 9, 8 return SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 118dd5d321..b9ecc70f52 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -44,6 +44,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SILPH_CO_GIOVANNI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 6, @@ -58,6 +59,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "local_id": "LOCALID_SILPH_CO_11F_GRUNT1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, @@ -86,6 +88,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { + "local_id": "LOCALID_SILPH_CO_11F_GRUNT2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 2e17911368..94aebcc2b0 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_GIOVANNI, 3 -.set LOCALID_GRUNT1, 4 -.set LOCALID_GRUNT2, 6 - SilphCo_11F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 @@ -61,21 +57,21 @@ SilphCo_11F_EventScript_GiovanniTriggerRight:: SilphCo_11F_EventScript_BattleGiovanni:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_GIOVANNI, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SILPH_CO_GIOVANNI, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 25 msgbox SilphCo_11F_Text_GiovanniIntro closemessage call_if_eq VAR_TEMP_1, 0, SilphCo_11F_EventScript_GiovanniApproachLeft call_if_eq VAR_TEMP_1, 1, SilphCo_11F_EventScript_GiovanniApproachRight - setvar VAR_LAST_TALKED, LOCALID_GIOVANNI + setvar VAR_LAST_TALKED, LOCALID_SILPH_CO_GIOVANNI trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat msgbox SilphCo_11F_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GIOVANNI - removeobject LOCALID_GRUNT1 - removeobject LOCALID_GRUNT2 + removeobject LOCALID_SILPH_CO_GIOVANNI + removeobject LOCALID_SILPH_CO_11F_GRUNT1 + removeobject LOCALID_SILPH_CO_11F_GRUNT2 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 setflag FLAG_HIDE_SAFFRON_ROCKETS @@ -84,13 +80,13 @@ SilphCo_11F_EventScript_BattleGiovanni:: end SilphCo_11F_EventScript_GiovanniApproachLeft:: - applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft + applymovement LOCALID_SILPH_CO_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft applymovement LOCALID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni waitmovement 0 return SilphCo_11F_EventScript_GiovanniApproachRight:: - applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight + applymovement LOCALID_SILPH_CO_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight waitmovement 0 return diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e1739bc2db..8c6929f722 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SILPH_CO_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 2, @@ -114,6 +115,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SILPH_CO_7F_WORKER_M2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 9, diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 44baf6deae..7c6898d89a 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_RIVAL, 1 -.set LOCALID_WORKER_M2, 8 - SilphCo_7F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition @@ -17,7 +14,7 @@ SilphCo_7F_OnTransition:: end SilphCo_7F_EventScript_SetObjRocketsGone:: - setobjectmovementtype LOCALID_WORKER_M2, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_SILPH_CO_7F_WORKER_M2, MOVEMENT_TYPE_FACE_UP return SilphCo_7F_EventScript_RivalTriggerTop:: @@ -35,16 +32,16 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: SilphCo_7F_EventScript_RivalScene:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_SILPH_CO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_SILPH_CO_RIVAL, Common_Movement_Delay48 waitmovement 0 msgbox SilphCo_7F_Text_RivalWhatKeptYou call_if_eq VAR_TEMP_1, 0, SilphCo_7F_EventScript_RivalApproachTop call_if_eq VAR_TEMP_1, 1, SilphCo_7F_EventScript_RivalApproachBottom msgbox SilphCo_7F_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_SILPH_CO_RIVAL call_if_eq VAR_STARTER_MON, 2, SilphCo_7F_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, SilphCo_7F_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, SilphCo_7F_EventScript_RivalCharmander @@ -55,7 +52,7 @@ SilphCo_7F_EventScript_RivalScene:: call_if_eq VAR_TEMP_1, 1, SilphCo_7F_EventScript_RivalExitBottom playse SE_WARP_IN fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_SILPH_CO_RIVAL waitse setvar VAR_MAP_SCENE_SILPH_CO_7F, 1 releaseall @@ -63,7 +60,7 @@ SilphCo_7F_EventScript_RivalScene:: SilphCo_7F_EventScript_RivalApproachTop:: closemessage - applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalApproachTop + applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return @@ -83,12 +80,12 @@ SilphCo_7F_EventScript_RivalCharmander:: return SilphCo_7F_EventScript_RivalExitTop:: - applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitTop + applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return SilphCo_7F_EventScript_RivalExitBottom:: - applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitBottom + applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index e834c759b0..2d3d4dbc8c 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -107,7 +107,7 @@ "x": 11, "y": 12, "respawn_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_SIX_ISLAND_NURSE" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index fe9af63192..82b4a052cd 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SAPPHIRE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAPPHIRE", "x": 7, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { + "local_id": "LOCALID_DOTTED_HOLE_THIEF", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index df78de19a0..33b2b160bc 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_SAPPHIRE, 1 -.equ LOCALID_THIEF, 2 - SixIsland_DottedHole_SapphireRoom_MapScripts:: .byte 0 @@ -13,10 +10,10 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: waitmessage waitfanfare closemessage - setobjectxyperm LOCALID_THIEF, 5, 0 - addobject LOCALID_THIEF + setobjectxyperm LOCALID_DOTTED_HOLE_THIEF, 5, 0 + addobject LOCALID_DOTTED_HOLE_THIEF playse SE_FALL - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 playse SE_M_STRENGTH call_if_eq VAR_FACING, DIR_NORTH, SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft @@ -53,7 +50,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: call_if_eq VAR_FACING, DIR_WEST, SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest playse SE_EXIT delay 35 - removeobject LOCALID_THIEF + removeobject LOCALID_DOTTED_HOLE_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY release end @@ -80,48 +77,48 @@ SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 @@ -129,25 +126,25 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index b027d1990f..a53a6df47c 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SIX_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SIX_ISLAND_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 8b8cab6761..366a3d9c2f 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_RIVAL, 2 - SixIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -22,25 +20,25 @@ SixIsland_PokemonCenter_1F_OnFrame:: SixIsland_PokemonCenter_1F_EventScript_RivalScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 25 - applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach + applymovement LOCALID_SIX_ISLAND_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach waitmovement 0 msgbox SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere closemessage applymovement LOCALID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit - applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit + applymovement LOCALID_SIX_ISLAND_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit waitmovement 0 fadedefaultbgm playse SE_EXIT delay 35 - removeobject LOCALID_RIVAL + removeobject LOCALID_SIX_ISLAND_RIVAL setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 72cc69b52c..0f182a588d 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "local_id": "LOCALID_RUIN_VALLEY_SCIENTIST", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 24, diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 6df247886a..d48dda2394 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_SCIENTIST, 1 - SixIsland_RuinValley_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 @@ -15,10 +13,10 @@ SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: SixIsland_RuinValley_EventScript_Scientist:: lock msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside - applymovement LOCALID_SCIENTIST, Common_Movement_FacePlayer + applymovement LOCALID_RUIN_VALLEY_SCIENTIST, Common_Movement_FacePlayer waitmovement 0 msgbox SixIsland_RuinValley_Text_IFoundThisPlace - applymovement LOCALID_SCIENTIST, Common_Movement_FaceOriginalDirection + applymovement LOCALID_RUIN_VALLEY_SCIENTIST, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 6a975331d6..be44113c95 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_THREE_ISLAND_ANTIBIKER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, @@ -41,6 +42,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_ANTIBIKER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, @@ -55,6 +57,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { + "local_id": "LOCALID_PAXTON", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, @@ -69,6 +72,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, @@ -83,6 +87,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, @@ -97,6 +102,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER4", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, @@ -111,6 +117,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, @@ -125,6 +132,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER5", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, @@ -209,6 +217,7 @@ "flag": "0" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER6", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, @@ -392,7 +401,7 @@ "x": 14, "y": 28, "respawn_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_THREE_ISLAND_NURSE" } ] } diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 030a67aea7..8f3e0dfd27 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,13 +1,3 @@ -.equ LOCALID_ANTIBIKER1, 1 -.equ LOCALID_ANTIBIKER2, 2 -.equ LOCALID_PAXTON, 3 -.equ LOCALID_BIKER1, 5 -.equ LOCALID_BIKER2, 7 -.equ LOCALID_BIKER3, 4 -.equ LOCALID_BIKER4, 6 -.equ LOCALID_BIKER5, 8 -.equ LOCALID_BIKER6, 14 - ThreeIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 @@ -23,8 +13,8 @@ ThreeIsland_EventScript_HideAntiBikers:: return ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers:: - setobjectmovementtype LOCALID_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND - setobjectmovementtype LOCALID_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND + setobjectmovementtype LOCALID_THREE_ISLAND_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND + setobjectmovementtype LOCALID_THREE_ISLAND_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND return ThreeIsland_EventScript_Biker:: @@ -44,14 +34,14 @@ ThreeIsland_EventScript_AntiBiker1:: end ThreeIsland_EventScript_AntiBiker1GotFullRestore:: - applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_YouveGotImpressiveMons release end ThreeIsland_EventScript_GiveFullRestore:: - applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt checkitemspace ITEM_FULL_RESTORE @@ -71,25 +61,25 @@ ThreeIsland_EventScript_NoRoomForFullRestore:: ThreeIsland_EventScript_BikerArgumentScene:: call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceLeft call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceLeft - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_GoBackToKanto call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker - applymovement LOCALID_BIKER1, ThreeIsland_Movement_SpeakLeft + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_BossIsOnHisWay call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceUp call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceUp call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceAntiBiker - applymovement LOCALID_ANTIBIKER2, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER2, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_GetOffIslandNow call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker - applymovement LOCALID_BIKER3, ThreeIsland_Movement_SpeakLeft + applymovement LOCALID_THREE_ISLAND_BIKER3, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_WhosGonnaMakeMe return @@ -136,7 +126,7 @@ ThreeIsland_EventScript_AntiBiker2:: end ThreeIsland_EventScript_AntiBiker2BikersGone:: - applymovement LOCALID_ANTIBIKER2, Common_Movement_FacePlayer + applymovement LOCALID_THREE_ISLAND_ANTIBIKER2, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge release @@ -145,19 +135,19 @@ ThreeIsland_EventScript_AntiBiker2BikersGone:: ThreeIsland_EventScript_BikerBossIntroTrigger:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_AreYouBossGoBackToKanto applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_JustGotHerePal - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_FollowersRaisingHavoc applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_OughtToBeThankingUs - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_YouCowardsToughInPack setvar VAR_MAP_SCENE_THREE_ISLAND, 3 @@ -204,45 +194,45 @@ ThreeIsland_EventScript_BattleBikersTriggerRight:: ThreeIsland_EventScript_BattleBikersScene:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_BIKER1, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_BIKER1, Common_Movement_ExclamationMark + applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_BIKER1, Common_Movement_Delay48 + applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, ThreeIsland_EventScript_LeaveBikersAlone msgbox ThreeIsland_Text_Biker1Intro - setvar VAR_LAST_TALKED, LOCALID_BIKER1 + setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER1 trainerbattle_no_intro TRAINER_BIKER_GOON, ThreeIsland_Text_Biker1Defeat - applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerSpeak + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_BikerSpeak waitmovement 0 msgbox ThreeIsland_Text_Biker1PostBattle closemessage - applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach + applymovement LOCALID_THREE_ISLAND_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker2Intro - setvar VAR_LAST_TALKED, LOCALID_BIKER2 + setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER2 trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat - applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerSpeak + applymovement LOCALID_THREE_ISLAND_BIKER2, ThreeIsland_Movement_BikerSpeak waitmovement 0 msgbox ThreeIsland_Text_Biker2PostBattle closemessage - applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach + applymovement LOCALID_THREE_ISLAND_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker3Intro - setvar VAR_LAST_TALKED, LOCALID_BIKER3 + setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement LOCALID_BIKER4, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_BIKER5, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER4, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER5, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ThreeIsland_Text_Biker3PostBattle closemessage @@ -260,45 +250,45 @@ ThreeIsland_EventScript_BattleBikersScene:: closemessage fadescreen FADE_TO_BLACK removeobject LOCALID_PAXTON - removeobject LOCALID_BIKER1 - removeobject LOCALID_BIKER2 - removeobject LOCALID_BIKER3 - removeobject LOCALID_BIKER4 - removeobject LOCALID_BIKER5 - removeobject LOCALID_BIKER6 + removeobject LOCALID_THREE_ISLAND_BIKER1 + removeobject LOCALID_THREE_ISLAND_BIKER2 + removeobject LOCALID_THREE_ISLAND_BIKER3 + removeobject LOCALID_THREE_ISLAND_BIKER4 + removeobject LOCALID_THREE_ISLAND_BIKER5 + removeobject LOCALID_THREE_ISLAND_BIKER6 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end ThreeIsland_EventScript_PaxtonApproachLeft:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidLeft:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMid:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidRight:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachRight:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 @@ -309,7 +299,7 @@ ThreeIsland_EventScript_LeaveBikersAlone:: closemessage applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers waitmovement 0 - applymovement LOCALID_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack waitmovement 0 fadedefaultbgm releaseall diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 18151e2328..f037061a09 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BERRY_FOREST_LOSTELLE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8aeed468cc..9aefd0fc1f 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LOSTELLE, 1 - ThreeIsland_BerryForest_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 @@ -14,9 +12,9 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: faceplayer msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon playse SE_PIN - applymovement LOCALID_LOSTELLE, Common_Movement_ExclamationMark + applymovement LOCALID_BERRY_FOREST_LOSTELLE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround + applymovement LOCALID_BERRY_FOREST_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround waitmovement 0 msgbox ThreeIsland_BerryForest_Text_HereItComesAgain goto_if_questlog EventScript_ReleaseEnd @@ -26,7 +24,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: setwildbattle SPECIES_HYPNO, 30 dowildbattle special QuestLog_CutRecording - applymovement LOCALID_LOSTELLE, Common_Movement_FacePlayer + applymovement LOCALID_BERRY_FOREST_LOSTELLE, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis giveitem ITEM_IAPAPA_BERRY diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 6b40c01eb4..851c70a532 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_PROSPECTOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 23, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 2c66fb6f49..889af04201 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_PROSPECTOR, 1 - ThreeIsland_DunsparceTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 40a381d8a1..663610c189 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_THREE_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 7547f513bc..5304effe22 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index b92b7b6b7d..9d15aa978a 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index e6adefa4b5..a78eee80a3 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 82ad54a674..5fe5dce7a6 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 706a18d533..5b1e39ebd8 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index b10e110e0c..3f64443c47 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 33fa4b6bcd..db35b661c0 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 5624035e36..0193e52d1d 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 8ca6a756dc..bc3221e5c4 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TOWER_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_MART_CLERK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, @@ -44,6 +46,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_RECEPTIONIST", "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, @@ -58,6 +61,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_COOLTRAINER_F", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 12, @@ -72,6 +76,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_BALDING_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index dd6c46304f..b2543ec3f7 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -1,9 +1,3 @@ -.set LOCALID_NURSE, 1 -.set LOCALID_MART_CLERK, 2 -.set LOCALID_RECEPTIONIST, 3 -.set LOCALID_COOLTRAINER_F, 4 -.set LOCALID_BALDING_MAN, 5 - TrainerTower_Lobby_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField @@ -25,11 +19,11 @@ TrainerTower_Lobby_OnResumeEnd:: end TrainerTower_Lobby_OnReturnToField:: - addobject LOCALID_NURSE - addobject LOCALID_MART_CLERK - addobject LOCALID_RECEPTIONIST - addobject LOCALID_COOLTRAINER_F - addobject LOCALID_BALDING_MAN + addobject LOCALID_TOWER_NURSE + addobject LOCALID_TOWER_MART_CLERK + addobject LOCALID_TOWER_RECEPTIONIST + addobject LOCALID_TOWER_COOLTRAINER_F + addobject LOCALID_TOWER_BALDING_MAN end TrainerTower_Lobby_OnLoad:: diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index c866bddfcd..fb62b1b012 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -211,7 +211,7 @@ "x": 21, "y": 8, "respawn_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_TWO_ISLAND_NURSE" } ] } diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index a37a6d584d..fe81353a9f 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CAPE_BRINK_TUTOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 58f88994c5..5c8be1cbcf 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_JOYFUL_GAME_CORNER_DADDY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_JOYFUL_GAME_CORNER_BIKER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 5, @@ -44,6 +46,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { + "local_id": "LOCALID_JOYFUL_GAME_CORNER_LOSTELLE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 2c047312e2..e1cfe47bdf 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,7 +1,3 @@ -.equ LOCALID_DADDY, 1 -.equ LOCALID_BIKER, 2 -.equ LOCALID_LOSTELLE, 3 - TwoIsland_JoyfulGameCorner_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp @@ -14,9 +10,9 @@ TwoIsland_JoyfulGameCorner_OnTransition:: end TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: - setobjectxyperm LOCALID_DADDY, 6, 2 - setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN - setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND + setobjectxyperm LOCALID_JOYFUL_GAME_CORNER_DADDY, 6, 2 + setobjectmovementtype LOCALID_JOYFUL_GAME_CORNER_DADDY, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_JOYFUL_GAME_CORNER_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return @@ -43,7 +39,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: special BufferBigGuyOrBigGirlString msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy closemessage - applymovement LOCALID_LOSTELLE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_JOYFUL_GAME_CORNER_LOSTELLE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall @@ -52,18 +48,18 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo closemessage - applymovement LOCALID_DADDY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_DADDY, Common_Movement_ExclamationMark + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DADDY, Common_Movement_Delay48 + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -74,19 +70,19 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: applymovement LOCALID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 - addobject LOCALID_BIKER - applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround + addobject LOCALID_JOYFUL_GAME_CORNER_BIKER + applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland - applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing closemessage - applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_EXIT - removeobject LOCALID_BIKER + removeobject LOCALID_JOYFUL_GAME_CORNER_BIKER fadedefaultbgm delay 60 msgbox TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 6daf7c00a7..f294d71b0e 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TWO_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 45c625f847..acbcd9c253 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -30,6 +30,7 @@ "flag": "0" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_4", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, @@ -44,6 +45,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_8", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, @@ -58,6 +60,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_7", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, @@ -72,6 +75,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_6", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, @@ -86,6 +90,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_5", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, @@ -100,6 +105,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -114,6 +120,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, @@ -128,6 +135,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 3c63a11f5f..5cd15cd516 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -97,6 +97,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VERMILION_FERRY_SAILOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, @@ -307,7 +308,7 @@ "x": 15, "y": 7, "respawn_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_VERMILION_NURSE" } ] } diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 3435f8a7bc..580560a5de 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_FERRY_SAILOR, 6 - VermilionCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame @@ -191,7 +189,7 @@ VermilionCity_EventScript_ExitedTicketCheck:: VermilionCity_EventScript_CheckTicket:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_VERMILION_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 4faf563650..e937f548e4 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VERMILION_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 2ab3825ad7..dd026da17d 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -72,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_POKEMON_FAN_CLUB_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, @@ -86,6 +87,7 @@ "flag": "0" }, { + "local_id": "LOCALID_POKEMON_FAN_CLUB_FAT_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index b5c9e005c1..c2bad77226 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_WOMAN, 5 -.set LOCALID_FAT_MAN, 6 - .set SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2 .set SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3 @@ -57,7 +54,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 setflag SPOKE_TO_WOMAN_LAST release @@ -66,7 +63,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 clearflag SPOKE_TO_FAT_MAN_LAST release @@ -78,7 +75,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail closemessage - applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_FAT_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 setflag SPOKE_TO_FAT_MAN_LAST release @@ -87,7 +84,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute closemessage - applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_FAT_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 clearflag SPOKE_TO_WOMAN_LAST release diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 069f4213ac..24d4550f90 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -72,6 +72,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { + "local_id": "LOCALID_VICTORY_ROAD_1F_BOULDER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index c7db0fc69b..e459d4298a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_BOULDER, 5 - VictoryRoad_1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition @@ -26,7 +24,7 @@ VictoryRoad_1F_EventScript_FloorSwitch:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER + copyobjectxytoperm LOCALID_VICTORY_ROAD_1F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 releaseall end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index ab71c632d9..968726ccc3 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -156,6 +156,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VICTORY_ROAD_2F_BOULDER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, @@ -170,6 +171,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VICTORY_ROAD_2F_BOULDER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 7e8140e294..eb9af7d67b 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BOULDER1, 11 -.set LOCALID_BOULDER2, 12 - VictoryRoad_2F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad .byte 0 @@ -28,7 +25,7 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER1 + copyobjectxytoperm LOCALID_VICTORY_ROAD_2F_BOULDER1 setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 releaseall end @@ -45,7 +42,7 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER2 + copyobjectxytoperm LOCALID_VICTORY_ROAD_2F_BOULDER2 setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 releaseall end diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 1c62f8a198..982939220d 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -100,6 +100,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { + "local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 19, @@ -142,6 +143,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 23350fb8b0..8621b4045a 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BOULDER1, 7 -.set LOCALID_BOULDER2, 10 - VictoryRoad_3F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad .byte 0 @@ -22,8 +19,8 @@ VictoryRoad_3F_EventScript_FloorSwitch:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER1 - copyobjectxytoperm LOCALID_BOULDER2 + copyobjectxytoperm LOCALID_VICTORY_ROAD_3F_BOULDER1 + copyobjectxytoperm LOCALID_VICTORY_ROAD_3F_BOULDER2 setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 releaseall end diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 0633b37891..6f2d9bdc5a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -60,6 +60,7 @@ "flag": "FLAG_TEMP_11" }, { + "local_id": "LOCALID_VIRIDIAN_OLD_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 34, @@ -74,6 +75,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TUTORIAL_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 21, @@ -88,6 +90,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VIRIDIAN_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, @@ -281,7 +284,7 @@ "x": 26, "y": 27, "respawn_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", - "respawn_npc": 1 + "respawn_npc": "LOCALID_VIRIDIAN_NURSE" } ] } diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index a657c5d6eb..d6c71605bc 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_OLD_MAN, 3 -.set LOCALID_TUTORIAL_MAN, 4 -.set LOCALID_WOMAN, 5 - ViridianCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 @@ -88,7 +84,7 @@ ViridianCity_EventScript_OldMan:: goto_if_eq VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1, ViridianCity_EventScript_OldManGymLeaderReturned msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs closemessage - applymovement LOCALID_OLD_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VIRIDIAN_OLD_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -180,7 +176,7 @@ ViridianCity_EventScript_Woman:: ViridianCity_EventScript_WomanRoadBlocked:: msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VIRIDIAN_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 12b470ba7a..db40023980 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -114,6 +114,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VIRIDIAN_GIOVANNI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 2, diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index c1ca590e05..3e07a41b72 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_GIOVANNI, 8 - ViridianCity_Gym_MapScripts:: .byte 0 @@ -10,7 +8,7 @@ ViridianCity_Gym_EventScript_Giovanni:: msgbox ViridianCity_Gym_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GIOVANNI + removeobject LOCALID_VIRIDIAN_GIOVANNI fadescreen FADE_FROM_BLACK release end diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 23cbb6e812..e17af97659 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VIRIDIAN_MART_CLERK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index f841802521..1210dd8263 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_CLERK, 1 - ViridianCity_Mart_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame @@ -21,11 +19,11 @@ ViridianCity_Mart_OnFrame:: ViridianCity_Mart_EventScript_ParcelScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_CLERK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_VIRIDIAN_MART_CLERK, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ViridianCity_Mart_Text_YouCameFromPallet closemessage - applymovement LOCALID_CLERK, ViridianCity_Mart_Movement_FacePlayer + applymovement LOCALID_VIRIDIAN_MART_CLERK, ViridianCity_Mart_Movement_FacePlayer applymovement LOCALID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter waitmovement 0 msgbox ViridianCity_Mart_Text_TakeThisToProfOak diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 84ad95c4db..3556932f9c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VIRIDIAN_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/ViridianCity_School/map.json b/data/maps/ViridianCity_School/map.json index 1951611470..f9a6bac706 100644 --- a/data/maps/ViridianCity_School/map.json +++ b/data/maps/ViridianCity_School/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SCHOOL_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SCHOOL_LASS", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, diff --git a/data/maps/ViridianCity_School/scripts.inc b/data/maps/ViridianCity_School/scripts.inc index fdb02d481b..e8a73080d9 100644 --- a/data/maps/ViridianCity_School/scripts.inc +++ b/data/maps/ViridianCity_School/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_WOMAN, 1 -.set LOCALID_LASS, 2 - ViridianCity_School_MapScripts:: .byte 0 @@ -9,7 +6,7 @@ ViridianCity_School_EventScript_Lass:: faceplayer msgbox ViridianCity_School_Text_TryingToMemorizeNotes closemessage - applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SCHOOL_LASS, Common_Movement_WalkInPlaceFasterUp waitmovement 0 release end @@ -19,7 +16,7 @@ ViridianCity_School_EventScript_Woman:: faceplayer msgbox ViridianCity_School_Text_ReadBlackboardCarefully closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SCHOOL_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -36,7 +33,7 @@ ViridianCity_School_EventScript_Notebook:: msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook msgbox ViridianCity_School_Text_NotebookFourthPage - applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SCHOOL_LASS, Common_Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index fa56be6248..e5b0f72b29 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -399,8 +399,6 @@ EventScript_BodySlamTaught:: release end -.set LOCALID_CAPE_BRINK_TUTOR, 1 - TwoIsland_CapeBrink_House_EventScript_StarterTutor:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index b9b362707a..242b42023f 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -117,7 +117,7 @@ EventScript_CancelSail:: VermilionCity_EventScript_WalkUpPier:: closemessage - applymovement LOCALID_FERRY_SAILOR, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VERMILION_FERRY_SAILOR, Common_Movement_FaceOriginalDirection applymovement LOCALID_PLAYER, VermilionCity_Movement_WalkUp waitmovement 0 releaseall @@ -134,12 +134,12 @@ EventScript_SeviiDestinationsPage1:: specialvar VAR_0x8006, GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity - case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland - case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland + case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland + case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland case SEAGALLOP_THREE_ISLAND, EventScript_SailToThreeIsland - case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland - case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2 - case SCR_MENU_CANCEL, EventScript_CancelSail + case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland + case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2 + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_SeviiDestinationsPage2:: @@ -152,8 +152,8 @@ EventScript_SeviiDestinationsPage2:: case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland case SEAGALLOP_SIX_ISLAND, EventScript_SailToSixIsland case SEAGALLOP_SEVEN_ISLAND, EventScript_SailToSevenIsland - case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1 - case SCR_MENU_CANCEL, EventScript_CancelSail + case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1 + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_SailToVermilionCity:: diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 3bb9065549..a0487667df 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,5 +1,3 @@ -.set LOCALID_STICKER_MAN, 1 - CeladonCity_GameCorner_EventScript_PhotoPrinter:: lockall showmoneybox 0, 0 diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 89f5808547..6a526e9fc9 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -1,9 +1,3 @@ -@ Local IDs apply to all floors (not lobby or roof) -.equ LOCALID_TRAINER_DOUBLES1, 2 -.equ LOCALID_TRAINER_SINGLES, 3 -.equ LOCALID_TRAINER_KNOCKOUT, 4 -.equ LOCALID_TRAINER_DOUBLES2, 5 - .equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2 .equ HIDE_TRAINER_SINGLES, FLAG_TEMP_3 .equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4 @@ -40,8 +34,8 @@ TrainerTower_EventScript_SetObjectsSingles:: setflag HIDE_TRAINER_KNOCKOUT setflag HIDE_TRAINER_DOUBLES2 setvar DISABLE_DOUBLES_TRIGGER, TRUE - setobjectxyperm LOCALID_TRAINER_SINGLES, 15, 13 - setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_SINGLES, 15, 13 + setobjectmovementtype LOCALID_TOWER_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT goto TrainerTower_EventScript_HideOwner TrainerTower_EventScript_SetObjectsDoubles:: @@ -50,29 +44,29 @@ TrainerTower_EventScript_SetObjectsDoubles:: setvar DISABLE_SINGLES_TRIGGER, TRUE ttower_isfloorcleared goto_if_eq VAR_RESULT, TRUE, TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten - setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 - setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT - setobjectxyperm LOCALID_TRAINER_DOUBLES2, 10, 13 - setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES2, 10, 13 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT goto TrainerTower_EventScript_HideOwner TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: - setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 - setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN - setobjectxyperm LOCALID_TRAINER_DOUBLES2, 11, 12 - setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES2, 11, 12 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN goto TrainerTower_EventScript_HideOwner @ Knockout challenge re-uses trainer objects TrainerTower_EventScript_SetObjectsKnockout:: setflag HIDE_TRAINER_DOUBLES2 setvar DISABLE_DOUBLES_TRIGGER, TRUE - setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 10 - setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN - setobjectxyperm LOCALID_TRAINER_SINGLES, 14, 13 - setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT - setobjectxyperm LOCALID_TRAINER_KNOCKOUT, 10, 16 - setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 10 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TOWER_TRAINER_SINGLES, 14, 13 + setobjectmovementtype LOCALID_TOWER_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_KNOCKOUT, 10, 16 + setobjectmovementtype LOCALID_TOWER_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP TrainerTower_EventScript_HideOwner: setflag HIDE_OWNER end @@ -109,12 +103,12 @@ TrainerTower_EventScript_TriggerBattle:: TrainerTower_EventScript_DoSingleBattle: ttower_encountermusic - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_Delay48 waitmovement 0 setvar DISABLE_SINGLES_TRIGGER, TRUE - applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach + applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach waitmovement 0 ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0 msgbox gStringVar4 @@ -144,31 +138,31 @@ TrainerTower_EventScript_DoKnockoutBattle:: TrainerTower_EventScript_DoKnockoutBattle1: ttower_encountermusic - applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach + applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach waitmovement 0 goto TrainerTower_EventScript_DoKnockoutBattleIntro TrainerTower_EventScript_DoKnockoutBattle2:: ttower_encountermusic - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach waitmovement 0 goto TrainerTower_EventScript_DoKnockoutBattleIntro TrainerTower_EventScript_DoKnockoutBattle3:: ttower_encountermusic - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach + applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach waitmovement 0 TrainerTower_EventScript_DoKnockoutBattleIntro: ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1 @@ -203,13 +197,13 @@ TrainerTower_EventScript_DoThirdKnockoutBattle:: goto TrainerTower_EventScript_DoKnockoutBattle TrainerTower_EventScript_MoveDoublesTrainers:: - applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay + applymovement LOCALID_TOWER_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown goto TrainerTower_EventScript_SetFloorCleared TrainerTower_EventScript_MoveLastKnockoutTrainer:: - applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay + applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay TrainerTower_EventScript_SetFloorCleared: ttower_clearedfloor end @@ -339,9 +333,9 @@ TrainerTower_EventScript_DoubleBattleTriggerTop:: ttower_checkdoubles goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle ttower_encountermusic - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_Delay48 goto TrainerTower_EventScript_TriggerDoubleBattle TrainerTower_EventScript_DoubleBattleTriggerBottom:: @@ -349,9 +343,9 @@ TrainerTower_EventScript_DoubleBattleTriggerBottom:: ttower_checkdoubles goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle ttower_encountermusic - applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_DOUBLES2, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_DOUBLES2, Common_Movement_Delay48 TrainerTower_EventScript_TriggerDoubleBattle: waitmovement 0 setvar DISABLE_DOUBLES_TRIGGER, TRUE diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index 6ec14717b6..ff4feb66f0 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -19,8 +19,6 @@ EventScript_AfterWhiteOutHealMsg:: msgbox Text_MonsHealed return -@ LOCALID_MOM set by PalletTown_PlayersHouse_1F - EventScript_AfterWhiteOutMomHeal:: lockall textcolor NPC_TEXT_COLOR_FEMALE diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 99acf1bf25..31e2272d6e 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -208,14 +208,4 @@ #define OBJ_EVENT_ID_CAMERA LOCALID_CAMERA #define OBJ_EVENT_ID_PLAYER LOCALID_PLAYER -// Object event local ids referenced in C files -#define LOCALID_UNION_ROOM_PLAYER_4 2 -#define LOCALID_UNION_ROOM_PLAYER_8 3 -#define LOCALID_UNION_ROOM_PLAYER_7 4 -#define LOCALID_UNION_ROOM_PLAYER_6 5 -#define LOCALID_UNION_ROOM_PLAYER_5 6 -#define LOCALID_UNION_ROOM_PLAYER_3 7 -#define LOCALID_UNION_ROOM_PLAYER_2 8 -#define LOCALID_UNION_ROOM_PLAYER_1 9 - #endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/src/battle_setup.c b/src/battle_setup.c index ce6ba07b94..6d62084dbb 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -27,6 +27,7 @@ #include "battle_transition.h" #include "battle_controllers.h" #include "constants/battle_setup.h" +#include "constants/event_objects.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/songs.h" @@ -709,7 +710,7 @@ static void InitTrainerBattleVariables(void) { sTrainerBattleMode = 0; gTrainerBattleOpponent_A = 0; - sTrainerObjectEventLocalId = 0; + sTrainerObjectEventLocalId = LOCALID_NONE; sTrainerAIntroSpeech = NULL; sTrainerADefeatSpeech = NULL; sTrainerVictorySpeech = NULL; @@ -776,7 +777,7 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co static void SetMapVarsToTrainer(void) { - if (sTrainerObjectEventLocalId != 0) + if (sTrainerObjectEventLocalId != LOCALID_NONE) { gSpecialVar_LastTalked = sTrainerObjectEventLocalId; gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index bd0a13329b..d2bffe5ec3 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1206,7 +1206,7 @@ static const u8 sPlayerDirectionToCopyDirection[][4] = { static void ClearObjectEvent(struct ObjectEvent *objectEvent) { *objectEvent = (struct ObjectEvent){}; - objectEvent->localId = 0xFF; + objectEvent->localId = LOCALID_PLAYER; objectEvent->mapNum = MAP_NUM(MAP_UNDEFINED); objectEvent->mapGroup = MAP_GROUP(MAP_UNDEFINED); objectEvent->movementActionId = MOVEMENT_ACTION_NONE; @@ -1317,7 +1317,7 @@ static u8 InitObjectEventStateFromTemplate(const struct ObjectEventTemplate *tem s16 x; s16 y; bool8 isClone = FALSE; - u8 localId = 0; + u8 localId = LOCALID_NONE; s16 x2 = 0; s16 y2 = 0; s16 x3 = 0; @@ -7977,7 +7977,7 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct u16 x, y; u16 x2, y2; const struct ObjectEventGraphicsInfo *graphicsInfo; - s16 var; + s16 minX; objectEvent->offScreen = FALSE; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); @@ -7995,20 +7995,20 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct y2 = graphicsInfo->height + (s16)y; if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SSANNE_EXTERIOR) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SSANNE_EXTERIOR) - && objectEvent->localId == 1) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SSANNE_EXTERIOR) + && objectEvent->localId == LOCALID_SS_ANNE) { - var = -32; + minX = -32; } else { - var = -16; + minX = -16; } - if ((s16)x >= 256 || (s16)x2 < var) + if ((s16)x >= (DISPLAY_WIDTH + 16) || (s16)x2 < minX) { objectEvent->offScreen = TRUE; } - if ((s16)y >= 176 || (s16)y2 < -16) + if ((s16)y >= (DISPLAY_HEIGHT + 16) || (s16)y2 < -16) { objectEvent->offScreen = TRUE; } diff --git a/src/field_specials.c b/src/field_specials.c index 3aac8d910c..3c279395e2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2407,15 +2407,15 @@ static void MoveDeoxysObject(u8 num) u8 mapObjId; LoadPalette(sDeoxysObjectPals[num], OBJ_PLTT_ID(10), PLTT_SIZEOF(4)); ApplyGlobalFieldPaletteTint(10); - TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); + TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); if (num == 0) PlaySE(SE_M_CONFUSE_RAY); else PlaySE(SE_DEOXYS_MOVE); CreateTask(Task_WaitDeoxysFieldEffect, 8); - gFieldEffectArguments[0] = 1; - gFieldEffectArguments[1] = 56; - gFieldEffectArguments[2] = 2; + gFieldEffectArguments[0] = LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK; + gFieldEffectArguments[1] = MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR); + gFieldEffectArguments[2] = MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR); gFieldEffectArguments[3] = sDeoxysCoords[num][0]; gFieldEffectArguments[4] = sDeoxysCoords[num][1]; if (num == 0) @@ -2423,7 +2423,7 @@ static void MoveDeoxysObject(u8 num) else gFieldEffectArguments[5] = 5; FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK); - SetObjEventTemplateCoords(1, sDeoxysCoords[num][0], sDeoxysCoords[num][1]); + SetObjEventTemplateCoords(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, sDeoxysCoords[num][0], sDeoxysCoords[num][1]); } static void Task_WaitDeoxysFieldEffect(u8 taskId) diff --git a/src/heal_location.c b/src/heal_location.c index 1f7de48c0c..80700d49a3 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -2,6 +2,7 @@ #include "heal_location.h" #include "event_data.h" #include "constants/maps.h" +#include "constants/map_event_ids.h" #include "constants/heal_locations.h" static void SetWhiteoutRespawnHealerNpcAsLastTalked(u32 healLocationIdx); diff --git a/src/scrcmd.c b/src/scrcmd.c index ae4b5d72e2..497155eff6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1010,7 +1010,7 @@ bool8 ScrCmd_waitmovement(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - if (localId != 0) + if (localId != LOCALID_NONE) sMovingNpcId = localId; sMovingNpcMapGroup = gSaveBlock1Ptr->location.mapGroup; sMovingNpcMapNum = gSaveBlock1Ptr->location.mapNum; @@ -1024,7 +1024,7 @@ bool8 ScrCmd_waitmovementat(struct ScriptContext * ctx) u8 mapBank; u8 mapId; - if (localId != 0) + if (localId != LOCALID_NONE) sMovingNpcId = localId; mapBank = ScriptReadByte(ctx); mapId = ScriptReadByte(ctx); diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 7baf583f06..4d98548a7c 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -33,6 +33,8 @@ #define MAX_REMATCH_PARTIES 6 #define SKIP 0xFFFF +#define NO_REMATCH_LOCALID LOCALID_PLAYER + enum { VSSEEKER_NOT_CHARGED, @@ -823,12 +825,12 @@ static void GatherNearbyTrainerInfo(void) vsSeekerObjectIdx++; } } - sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = 0xFF; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = NO_REMATCH_LOCALID; } static void Task_VsSeeker_3(u8 taskId) { - if (ScriptMovement_IsObjectMovementFinished(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup)) + if (ScriptMovement_IsObjectMovementFinished(NO_REMATCH_LOCALID, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup)) { if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE) { @@ -852,7 +854,7 @@ static u8 CanUseVsSeeker(void) u8 vsSeekerChargeSteps = gSaveBlock1Ptr->trainerRematchStepCounter; if (vsSeekerChargeSteps == 100) { - if (GetRematchableTrainerLocalId() == 0xFF) + if (GetRematchableTrainerLocalId() == NO_REMATCH_LOCALID) return VSSEEKER_NO_ONE_IN_RANGE; else return VSSEEKER_CAN_USE; @@ -873,7 +875,7 @@ static u8 GetVsSeekerResponseInArea(const struct RematchData * vsSeekerData) u8 response = 0; s32 vsSeekerIdx = 0; - while (sVsSeeker->trainerInfo[vsSeekerIdx].localId != 0xFF) + while (sVsSeeker->trainerInfo[vsSeekerIdx].localId != NO_REMATCH_LOCALID) { if (IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[vsSeekerIdx]) == TRUE) { @@ -1258,7 +1260,7 @@ static u8 GetRematchableTrainerLocalId(void) u8 idx; u8 i; - for (i = 0; sVsSeeker->trainerInfo[i].localId != 0xFF; i++) + for (i = 0; sVsSeeker->trainerInfo[i].localId != NO_REMATCH_LOCALID; i++) { if (IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[i]) == 1) { @@ -1267,7 +1269,7 @@ static u8 GetRematchableTrainerLocalId(void) } } - return 0xFF; + return NO_REMATCH_LOCALID; } static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script) @@ -1304,7 +1306,7 @@ static void StartAllRespondantIdleMovements(void) for (i = 0; i < sVsSeeker->numRematchableTrainers; i++) { - for (j = 0; sVsSeeker->trainerInfo[j].localId != 0xFF; j++) + for (j = 0; sVsSeeker->trainerInfo[j].localId != NO_REMATCH_LOCALID; j++) { if (sVsSeeker->trainerInfo[j].trainerIdx == sVsSeeker->trainerIdxArray[i]) {