diff --git a/data/event_scripts.s b/data/event_scripts.s index 55720a6addf2..f18aae0b3acb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -774,8 +774,8 @@ EventScript_HideMrBriney:: return RusturfTunnel_EventScript_SetRusturfTunnelOpen:: - removeobject LOCALID_WANDAS_BF - removeobject LOCALID_WANDA + removeobject LOCALID_RUSTURF_TUNNEL_WANDAS_BF + removeobject LOCALID_RUSTURF_TUNNEL_WANDA clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA setvar VAR_RUSTURF_TUNNEL_STATE, 6 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 0faca2e94fa7..5698b008267a 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BATTLE_PIKE_LOBBY_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 5, "y": 5, diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index faba545f0e94..09806cf503c0 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_ATTENDANT, 1 - BattleFrontier_BattlePikeLobby_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp @@ -198,7 +196,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: end BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: - applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor + applymovement LOCALID_BATTLE_PIKE_LOBBY_ATTENDANT, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index f74dce23362e..d571ee6c1263 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BATTLE_TOWER_ELEVATOR_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 06f4ff0a70c9..d14e1898d07b 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_ATTENDANT, 1 - BattleFrontier_BattleTowerElevator_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp @@ -11,7 +9,7 @@ BattleFrontier_BattleTowerElevator_OnFrame: BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: setvar VAR_TEMP_0, 1 - applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter + applymovement LOCALID_BATTLE_TOWER_ELEVATOR_ATTENDANT, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter waitmovement 0 special BufferBattleTowerElevatorFloors @@ -19,7 +17,7 @@ BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: special MoveElevator waitstate delay 48 - applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerElevator_Movement_AttendantExit + applymovement LOCALID_BATTLE_TOWER_ELEVATOR_ATTENDANT, BattleFrontier_BattleTowerElevator_Movement_AttendantExit applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit waitmovement 0 call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index 7fab54636a25..1f182365e1f8 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "local_id": "LOCALID_BATTLE_FRONTIER_MART_CLERK", + "local_id": "LOCALID_FRONTIER_MART_CLERK", "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, @@ -29,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_FRONTIER_MART_OLD_WOMAN", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 6afe6a0186b0..e019d4ecc905 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_OLD_WOMAN, 2 - BattleFrontier_Mart_MapScripts:: .byte 0 @@ -38,7 +36,7 @@ BattleFrontier_Mart_EventScript_OldMan:: BattleFrontier_Mart_EventScript_OldWoman:: lock - applymovement LOCALID_OLD_WOMAN, Common_Movement_FaceDown + applymovement LOCALID_FRONTIER_MART_OLD_WOMAN, Common_Movement_FaceDown waitmovement 0 msgbox BattleFrontier_Mart_Text_ProteinMakeNiceGift, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index b993e92777ed..b44bd4b379a4 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FRONTIER_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 44806858fbe0..02201af8e562 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NURSE, 1 - BattleFrontier_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -10,7 +8,7 @@ BattleFrontier_PokemonCenter_1F_OnTransition: end BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_FRONTIER_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index 7a6de715ab62..60d7f4ccfc10 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SCOTTS_HOUSE_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 2, "y": 3, diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index affd05d3492b..8a818222b70d 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_SCOTT, 1 - BattleFrontier_ScottsHouse_MapScripts:: .byte 0 @@ -149,7 +147,7 @@ BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: call_if_eq VAR_FACING, DIR_EAST, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast call_if_eq VAR_FACING, DIR_WEST, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest msgbox BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal, MSGBOX_DEFAULT - applymovement LOCALID_SCOTT, Common_Movement_FacePlayer + applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing, MSGBOX_DEFAULT goto_if_eq VAR_SCOTT_STATE, 13, BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints @@ -192,22 +190,22 @@ BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: end BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index 152d32a79470..386c28b2af54 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_UNDERPASS_FOSSIL", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 132, "y": 10, diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 518d9888329e..a241724e51e4 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_FOSSIL, 1 - DesertUnderpass_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition .byte 0 @@ -18,13 +16,13 @@ DesertUnderpass_EventScript_Fossil:: DesertUnderpass_EventScript_GiveClawFossil:: giveitem ITEM_CLAW_FOSSIL - removeobject LOCALID_FOSSIL + removeobject LOCALID_UNDERPASS_FOSSIL release end DesertUnderpass_EventScript_GiveRootFossil:: giveitem ITEM_ROOT_FOSSIL - removeobject LOCALID_FOSSIL + removeobject LOCALID_UNDERPASS_FOSSIL release end diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 26551e4efe95..ec2e8795610d 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -39,6 +39,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEWFORD_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 9, @@ -65,6 +66,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEWFORD_BOAT", "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 8, diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 1250c2d7670d..30c763900393 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,15 +1,3 @@ -@ Sailing to and from Dewford uses local IDs from different maps -@ e.g. Route 104's sail to Dewford script references local IDs from Dewford's map -@ All of these local IDs are labeled here -.equ LOCALID_BRINEY_DEWFORD, 2 -.equ LOCALID_BOAT_DEWFORD, 4 - -.equ LOCALID_BOAT_R109, 1 -.equ LOCALID_BRINEY_R109, 2 - -.equ LOCALID_BOAT_R104, 7 -.equ LOCALID_BRINEY_R104, 8 - DewfordTown_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_OnTransition .byte 0 @@ -123,16 +111,16 @@ DewfordTown_EventScript_FishingNotSoGood:: DewfordTown_EventScript_SailToPetalburg:: call EventScript_BackupMrBrineyLocation - setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0 + setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0 - applymovement LOCALID_BRINEY_DEWFORD, DewfordTown_Movement_BrineyBoardBoat + applymovement LOCALID_DEWFORD_BRINEY, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 - removeobject LOCALID_BRINEY_DEWFORD + removeobject LOCALID_DEWFORD_BRINEY applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement LOCALID_BOAT_DEWFORD, DewfordTown_Movement_SailToPetalburg + applymovement LOCALID_DEWFORD_BOAT, DewfordTown_Movement_SailToPetalburg applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 @@ -144,7 +132,7 @@ DewfordTown_EventScript_SailToPetalburg:: clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - hideobjectat LOCALID_BOAT_DEWFORD, MAP_DEWFORD_TOWN + hideobjectat LOCALID_DEWFORD_BOAT, MAP_DEWFORD_TOWN setvar VAR_BOARD_BRINEY_BOAT_STATE, 2 resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 5, 4 @@ -155,39 +143,39 @@ DewfordTown_EventScript_SailToPetalburg:: DewfordTown_EventScript_SailToSlateport:: call EventScript_BackupMrBrineyLocation - setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0 + setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1 - applymovement LOCALID_BRINEY_DEWFORD, DewfordTown_Movement_BrineyBoardBoat + applymovement LOCALID_DEWFORD_BRINEY, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 - removeobject LOCALID_BRINEY_DEWFORD + removeobject LOCALID_DEWFORD_BRINEY applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement LOCALID_BOAT_DEWFORD, DewfordTown_Movement_SailToSlateport + applymovement LOCALID_DEWFORD_BOAT, DewfordTown_Movement_SailToSlateport applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToSlateport waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 - setobjectxyperm LOCALID_BRINEY_R109, 21, 26 - addobject LOCALID_BRINEY_R109 - setobjectsubpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0 - applymovement LOCALID_BRINEY_R109, DewfordTown_Movement_BrineyExitBoat + setobjectxyperm LOCALID_ROUTE109_BRINEY, 21, 26 + addobject LOCALID_ROUTE109_BRINEY + setobjectsubpriority LOCALID_ROUTE109_BRINEY, MAP_ROUTE109, 0 + applymovement LOCALID_ROUTE109_BRINEY, DewfordTown_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY - addobject LOCALID_BOAT_R109 + addobject LOCALID_ROUTE109_BOAT clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - hideobjectat LOCALID_BOAT_DEWFORD, MAP_DEWFORD_TOWN + hideobjectat LOCALID_DEWFORD_BOAT, MAP_DEWFORD_TOWN call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateportDeliverGoods call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN - resetobjectsubpriority LOCALID_BRINEY_R109, MAP_ROUTE109 - copyobjectxytoperm LOCALID_BRINEY_R109 + resetobjectsubpriority LOCALID_ROUTE109_BRINEY, MAP_ROUTE109 + copyobjectxytoperm LOCALID_ROUTE109_BRINEY release end diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 9489a3d1eee2..c253d16a6184 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -54,6 +54,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEWFORD_HALL_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 3, @@ -67,6 +68,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEWFORD_HALL_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 5, "y": 2, @@ -93,6 +95,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEWFORD_HALL_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 3, @@ -106,6 +109,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEWFORD_HALL_PSYCHIC_M", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 15, "y": 3, diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 1472bebb243b..c5a1ea4b8296 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -1,8 +1,3 @@ -.set LOCALID_EXPERT_M, 4 -.set LOCALID_TWIN, 5 -.set LOCALID_SCHOOL_KID_M, 7 -.set LOCALID_PSYCHIC_M, 8 - DewfordTown_Hall_MapScripts:: .byte 0 @@ -55,7 +50,7 @@ DewfordTown_Hall_EventScript_ExpertM:: call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT closemessage - applymovement LOCALID_EXPERT_M, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_DEWFORD_HALL_EXPERT_M, Common_Movement_WalkInPlaceFasterUp waitmovement 0 release end @@ -66,7 +61,7 @@ DewfordTown_Hall_EventScript_Twin:: call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT closemessage - applymovement LOCALID_TWIN, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_DEWFORD_HALL_TWIN, Common_Movement_WalkInPlaceFasterUp waitmovement 0 release end @@ -191,7 +186,7 @@ DewfordTown_Hall_EventScript_DontMovePlayer1:: return DewfordTown_Hall_EventScript_DebateReact1:: - applymovement LOCALID_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft + applymovement LOCALID_DEWFORD_HALL_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft waitmovement 0 goto_if_eq VAR_0x8008, 0, DewfordTown_Hall_EventScript_PlayerReactWest goto_if_eq VAR_0x8008, 1, DewfordTown_Hall_EventScript_DontMovePlayer2 @@ -207,7 +202,7 @@ DewfordTown_Hall_EventScript_DontMovePlayer2:: return DewfordTown_Hall_EventScript_DebateReact2:: - applymovement LOCALID_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight + applymovement LOCALID_DEWFORD_HALL_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight waitmovement 0 goto_if_eq VAR_0x8008, 0, DewfordTown_Hall_EventScript_PlayerReactNorthSouth goto_if_eq VAR_0x8008, 1, DewfordTown_Hall_EventScript_PlayerReactEast diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 305a1f16f7cf..abd9c2e6cff2 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CHAMPIONS_ROOM_WALLACE", "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 6, "y": 5, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 12, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" }, { + "local_id": "LOCALID_CHAMPIONS_ROOM_BIRCH", "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 12, diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index f9723ffa0f4b..b1f0e973b081 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_WALLACE, 1 -.set LOCALID_RIVAL, 2 -.set LOCALID_BIRCH, 3 - EverGrandeCity_ChampionsRoom_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp @@ -59,7 +55,7 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated:: checkplayergender call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic call_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic - addobject LOCALID_RIVAL + addobject LOCALID_CHAMPIONS_ROOM_RIVAL call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer checkplayergender goto_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayAdvice @@ -78,9 +74,9 @@ EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT @@ -91,9 +87,9 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT @@ -102,26 +98,26 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: closemessage - addobject LOCALID_BIRCH - applymovement LOCALID_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives + addobject LOCALID_CHAMPIONS_ROOM_BIRCH + applymovement LOCALID_CHAMPIONS_ROOM_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT call ProfBirch_EventScript_RatePokedex msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT - applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_CHAMPIONS_ROOM_WALLACE, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 - applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_CHAMPIONS_ROOM_WALLACE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT closemessage delay 30 - applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart + applymovement LOCALID_CHAMPIONS_ROOM_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart - applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterUp - applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalFollows + applymovement LOCALID_CHAMPIONS_ROOM_BIRCH, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown @@ -131,7 +127,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations call_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations closemessage - applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExit + applymovement LOCALID_CHAMPIONS_ROOM_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExit applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER @@ -149,14 +145,14 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: return EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: - applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: - applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth waitmovement 0 return diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index a146dc11a267..b74207871d90 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_EVER_GRANDE_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -54,6 +55,7 @@ "flag": "0" }, { + "local_id": "LOCALID_EVER_GRANDE_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 9, "y": 4, diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index ec45732e8c31..0bdd84765886 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_NURSE, 1 -.set LOCALID_SCOTT, 4 - EverGrandeCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -17,7 +14,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott:: return EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_EVER_GRANDE_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress @@ -44,17 +41,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: setflag FLAG_MET_SCOTT_IN_EVERGRANDE playse SE_EXIT waitse - removeobject LOCALID_SCOTT + removeobject LOCALID_EVER_GRANDE_SCOTT release end EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: - applymovement LOCALID_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth + applymovement LOCALID_EVER_GRANDE_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth waitmovement 0 return EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: - applymovement LOCALID_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit + applymovement LOCALID_EVER_GRANDE_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit waitmovement 0 return diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 6dd97c0b7256..e599b815b60c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_LEAGUE_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 3, "y": 2, @@ -41,6 +42,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LEAGUE_GUARD_1", "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 2, @@ -54,6 +56,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LEAGUE_GUARD_2", "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 2, diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index c13e71697586..4b3c05848ecb 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_NURSE, 1 -.set LOCALID_GUARD_1, 3 -.set LOCALID_GUARD_2, 4 - EverGrandeCity_PokemonLeague_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -14,12 +10,12 @@ EverGrandeCity_PokemonLeague_1F_OnTransition: end EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor:: - setobjectxyperm LOCALID_GUARD_1, 9, 2 - setobjectxyperm LOCALID_GUARD_2, 10, 2 + setobjectxyperm LOCALID_LEAGUE_GUARD_1, 9, 2 + setobjectxyperm LOCALID_LEAGUE_GUARD_2, 10, 2 return EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_LEAGUE_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress @@ -62,8 +58,8 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: delay 120 goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges closemessage - applymovement LOCALID_GUARD_1, EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay - applymovement LOCALID_GUARD_2, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay + applymovement LOCALID_LEAGUE_GUARD_1, EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay + applymovement LOCALID_LEAGUE_GUARD_2, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay waitmovement 0 delay 10 playfanfare MUS_OBTAIN_BADGE @@ -71,8 +67,8 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: waitmessage waitfanfare closemessage - copyobjectxytoperm LOCALID_GUARD_1 - copyobjectxytoperm LOCALID_GUARD_2 + copyobjectxytoperm LOCALID_LEAGUE_GUARD_1 + copyobjectxytoperm LOCALID_LEAGUE_GUARD_2 setflag FLAG_ENTERED_ELITE_FOUR releaseall end diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index b8f274df31cd..16a0b81dfa47 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FALLARBOR_TENT_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 8f705075c779..c8253eea49c1 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_ATTENDANT, 1 - FallarborTown_BattleTentLobby_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_OnWarp @@ -191,12 +189,12 @@ FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge:: end FallarborTown_BattleTentLobby_EventScript_WalkToDoor:: - applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor + applymovement LOCALID_FALLARBOR_TENT_ATTENDANT, FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor waitmovement 0 opendoor 6, 1 waitdooranim - applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor + applymovement LOCALID_FALLARBOR_TENT_ATTENDANT, FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor waitmovement 0 closedoor 6, 1 diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index d3d519ed1511..fe6d35df8a3a 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,5 +1,3 @@ -@ Note: LOCALID_FARAWAY_ISLAND_MEW is a local id for this map used elsewhere. It's defined in event_objects.h - FarawayIsland_Interior_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_OnResume map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_OnTransition diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 8123d2c4d705..778f0d74656b 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -41,6 +41,7 @@ "flag": "0" }, { + "local_id": "LOCALID_FORTREE_HOUSE_WINGULL", "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 3, diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index ed9167417376..8b104945715e 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_WINGULL, 3 - FortreeCity_House4_MapScripts:: .byte 0 @@ -16,9 +14,9 @@ FortreeCity_House4_EventScript_Boy:: closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - applymovement LOCALID_WINGULL, FortreeCity_House4_Movement_WingullExit + applymovement LOCALID_FORTREE_HOUSE_WINGULL, FortreeCity_House4_Movement_WingullExit waitmovement 0 - removeobject LOCALID_WINGULL + removeobject LOCALID_FORTREE_HOUSE_WINGULL releaseall end diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 33c7ce3c08ca..f039af170cb9 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -99,6 +99,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LAVARIDGE_RIVAL_ON_BIKE", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 6, "y": 16, @@ -112,6 +113,7 @@ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE" }, { + "local_id": "LOCALID_LAVARIDGE_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 12, "y": 15, diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 3ce226c4c135..40639a1a86ba 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_RIVAL_ON_BIKE, 7 -.set LOCALID_RIVAL, 8 - LavaridgeTown_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame @@ -26,9 +23,9 @@ LavaridgeTown_EventScript_CheckSetRivalPos:: return LavaridgeTown_EventScript_SetRivalPos:: - setobjectxyperm LOCALID_RIVAL, 11, 9 - setobjectxyperm LOCALID_RIVAL_ON_BIKE, 9, 8 - setobjectmovementtype LOCALID_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_LAVARIDGE_RIVAL, 11, 9 + setobjectxyperm LOCALID_LAVARIDGE_RIVAL_ON_BIKE, 9, 8 + setobjectmovementtype LOCALID_LAVARIDGE_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_UP clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL return @@ -78,12 +75,12 @@ LavaridgeTown_EventScript_BrendanGiveGoGoggles:: LavaridgeTown_EventScript_RivalExit:: closemessage - removeobject LOCALID_RIVAL - addobject LOCALID_RIVAL_ON_BIKE + removeobject LOCALID_LAVARIDGE_RIVAL + addobject LOCALID_LAVARIDGE_RIVAL_ON_BIKE delay 30 call_if_eq VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExit1 call_if_ne VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExit2 - removeobject LOCALID_RIVAL_ON_BIKE + removeobject LOCALID_LAVARIDGE_RIVAL_ON_BIKE setvar VAR_LAVARIDGE_TOWN_STATE, 2 clearflag FLAG_HIDE_MAP_NAME_POPUP savebgm MUS_DUMMY @@ -100,52 +97,52 @@ LavaridgeTown_EventScript_PlayBrendanMusic:: return LavaridgeTown_EventScript_RivalNoticePlayer:: - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterUp waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48 waitmovement 0 return LavaridgeTown_EventScript_RivalExitHerbShop:: opendoor 12, 15 waitdooranim - addobject LOCALID_RIVAL - applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop + addobject LOCALID_LAVARIDGE_RIVAL + applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop waitmovement 0 closedoor 12, 15 waitdooranim - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return LavaridgeTown_EventScript_RivalApproachPlayer1:: - applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1 + applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1 waitmovement 0 return LavaridgeTown_EventScript_RivalApproachPlayer2:: - applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2 + applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2 waitmovement 0 return LavaridgeTown_EventScript_RivalExit1:: applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit - applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit1 + applymovement LOCALID_LAVARIDGE_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return LavaridgeTown_EventScript_RivalExit2:: - applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2 + applymovement LOCALID_LAVARIDGE_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2 waitmovement 0 return diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 8cbeae0923db..2d9372d1d19e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_LAVARIDGE_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 9ff72aa812c4..fa67064252a5 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NURSE, 1 - LavaridgeTown_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -11,7 +9,7 @@ LavaridgeTown_PokemonCenter_1F_OnTransition: end LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_LAVARIDGE_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 34bd8d133410..4115e31fe348 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -260,6 +260,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LILYCOVE_WOMAN_1", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 41, "y": 25, @@ -273,6 +274,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LILYCOVE_MAN_1", "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 40, "y": 25, diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 094592d64662..0424202355ec 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_WOMAN_1, 19 -.set LOCALID_MAN_1, 20 - LilycoveCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_OnLoad @@ -136,13 +133,13 @@ LilycoveCity_EventScript_FatMan:: LilycoveCity_EventScript_Man1:: lockall msgbox LilycoveCity_Text_JustArrivedAndSawRarePokemon, MSGBOX_NPC - applymovement LOCALID_MAN_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_LILYCOVE_MAN_1, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_Woman1:: lockall msgbox LilycoveCity_Text_HoneymoonVowToSeeRarePokemon, MSGBOX_NPC - applymovement LOCALID_WOMAN_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_LILYCOVE_WOMAN_1, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_CitySign:: diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index a55d214988de..9979ca34bcf8 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -54,6 +54,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_MC", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 22, @@ -67,6 +68,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_JUDGE", "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 15, "y": 22, @@ -80,6 +82,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_CONTESTANT_1", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 25, @@ -93,6 +96,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_CONTESTANT_2", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 25, @@ -106,6 +110,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_CONTESTANT_3", "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 25, @@ -119,6 +124,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_CONTESTANT_4", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 16, "y": 25, @@ -145,6 +151,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_AUDIENCE_4", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 24, @@ -158,6 +165,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_AUDIENCE_2", "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, @@ -171,6 +179,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_MC", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 24, "y": 10, @@ -184,6 +193,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_JUDGE", "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 27, "y": 10, @@ -197,6 +207,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_CONTESTANT_1", "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 22, "y": 13, @@ -210,6 +221,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_CONTESTANT_2", "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 24, "y": 13, @@ -223,6 +235,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_CONTESTANT_3", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 26, "y": 13, @@ -236,6 +249,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_CONTESTANT_4", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 28, "y": 13, @@ -249,6 +263,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_AUDIENCE_1", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 20, "y": 10, @@ -262,6 +277,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_AUDIENCE_3", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 30, "y": 11, @@ -275,6 +291,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BEAUTY_AUDIENCE_2", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 8, @@ -288,6 +305,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SMART_AUDIENCE_3", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 20, @@ -301,6 +319,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_MC", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 36, "y": 22, @@ -314,6 +333,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_JUDGE", "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 39, "y": 22, @@ -327,6 +347,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_CONTESTANT_1", "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 34, "y": 25, @@ -340,6 +361,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_CONTESTANT_2", "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 36, "y": 25, @@ -353,6 +375,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_CONTESTANT_3", "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 38, "y": 25, @@ -366,6 +389,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_CONTESTANT_4", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 40, "y": 25, @@ -379,6 +403,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_AUDIENCE_1", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 32, "y": 23, @@ -392,6 +417,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_AUDIENCE_3", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 37, "y": 20, @@ -405,6 +431,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CUTE_AUDIENCE_2", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 42, "y": 24, diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 610611358d70..b1c59c892275 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -1,32 +1,7 @@ -@ VAR_LAST_TALKED would have made all these direct references unnecessary -.set LOCALID_SMART_MC, 4 -.set LOCALID_SMART_JUDGE, 5 -.set LOCALID_SMART_CONTESTANT_1, 6 -.set LOCALID_SMART_CONTESTANT_2, 7 -.set LOCALID_SMART_CONTESTANT_3, 8 -.set LOCALID_SMART_CONTESTANT_4, 9 -.set LOCALID_SMART_AUDIENCE_4, 11 -.set LOCALID_SMART_AUDIENCE_2, 12 -.set LOCALID_BEAUTY_MC, 13 -.set LOCALID_BEAUTY_JUDGE, 14 -.set LOCALID_BEAUTY_CONTESTANT_1, 15 -.set LOCALID_BEAUTY_CONTESTANT_2, 16 -.set LOCALID_BEAUTY_CONTESTANT_3, 17 -.set LOCALID_BEAUTY_CONTESTANT_4, 18 -.set LOCALID_BEAUTY_AUDIENCE_1, 19 -.set LOCALID_BEAUTY_AUDIENCE_3, 20 -.set LOCALID_BEAUTY_AUDIENCE_2, 21 -.set LOCALID_SMART_AUDIENCE_3, 22 -.set LOCALID_CUTE_MC, 23 -.set LOCALID_CUTE_JUDGE, 24 -.set LOCALID_CUTE_CONTESTANT_1, 25 -.set LOCALID_CUTE_CONTESTANT_2, 26 -.set LOCALID_CUTE_CONTESTANT_3, 27 -.set LOCALID_CUTE_CONTESTANT_4, 28 -.set LOCALID_CUTE_AUDIENCE_1, 29 -.set LOCALID_CUTE_AUDIENCE_3, 30 -.set LOCALID_CUTE_AUDIENCE_2, 31 - +@ All the LOCALID constants used in this file are essentially redundant. +@ They're all used to have the NPC the player talked to turn back so they're facing +@ their original direction (because they're watching/participating in the contests). +@ They could all be substituted for VAR_LAST_TALKED. LilycoveCity_ContestHall_MapScripts:: .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 098b53336046..859b0f11b63a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MOTEL_OWNER", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 3, diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 796645f47fcd..076228ae6e0f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_OWNER, 1 - LilycoveCity_CoveLilyMotel_1F_MapScripts:: .byte 0 @@ -8,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted msgbox LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot, MSGBOX_DEFAULT - applymovement LOCALID_OWNER, Common_Movement_FacePlayer + applymovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua, MSGBOX_DEFAULT closemessage - applymovement LOCALID_OWNER, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT - applymovement LOCALID_OWNER, Common_Movement_FacePlayer + applymovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted, MSGBOX_DEFAULT closemessage - applymovement LOCALID_OWNER, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT - applymovement LOCALID_OWNER, Common_Movement_FacePlayer + applymovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner, MSGBOX_DEFAULT closemessage - applymovement LOCALID_OWNER, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -42,18 +40,18 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: lockall playse SE_PIN - applymovement LOCALID_OWNER, Common_Movement_ExclamationMark + applymovement LOCALID_MOTEL_OWNER, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_OWNER, Common_Movement_Delay48 + applymovement LOCALID_MOTEL_OWNER, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV - applymovement LOCALID_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer + applymovement LOCALID_MOTEL_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer waitmovement 0 - applymovement LOCALID_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn + applymovement LOCALID_MOTEL_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn waitmovement 0 release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index e816d3f217a4..a7d258ec9c73 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -93,6 +93,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 5, diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index a9683d13c9b6..84b8a3ac7e7f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_WOMAN, 7 - LilycoveCity_DepartmentStore_5F_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp .byte 0 @@ -13,8 +11,8 @@ LilycoveCity_DepartmentStore_5F_OnWarp: .2byte 0 LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs:: - setobjectxy LOCALID_WOMAN, 16, 2 - turnobject LOCALID_WOMAN, DIR_NORTH + setobjectxy LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, 16, 2 + turnobject LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, DIR_NORTH end LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @@ -127,7 +125,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: LilycoveCity_DepartmentStore_5F_EventScript_Woman:: lockall - applymovement LOCALID_WOMAN, Common_Movement_FacePlayer + applymovement LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 0, LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 4, LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal @@ -143,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT closemessage - applymovement LOCALID_WOMAN, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, Common_Movement_WalkInPlaceFasterUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 06d49e0c8899..671e6edd7400 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_LILYCOVE_HARBOR_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" }, { + "local_id": "LOCALID_LILYCOVE_HARBOR_SS_TIDAL", "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, @@ -54,6 +56,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 10, @@ -67,6 +70,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" }, { + "local_id": "LOCALID_LILYCOVE_HARBOR_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 8, "y": 10, diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 63010dc4c77d..9187199296b1 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,8 +1,3 @@ -.set LOCALID_ATTENDANT, 1 -.set LOCALID_SS_TIDAL, 2 -.set LOCALID_FERRY_SAILOR, 4 -.set LOCALID_BRINEY, 5 - LilycoveCity_Harbor_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_OnTransition .byte 0 @@ -231,16 +226,16 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: call LilycoveCity_Harbor_EventScript_GetEventTicketSailor msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp waitmovement 0 playse SE_PIN - applymovement LOCALID_FERRY_SAILOR, Common_Movement_ExclamationMark + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_FERRY_SAILOR, Common_Movement_Delay48 + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_Delay48 waitmovement 0 call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast - addobject LOCALID_BRINEY + addobject LOCALID_LILYCOVE_HARBOR_BRINEY call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast msgbox EventTicket_Text_BrineyHoldOnASecond, MSGBOX_DEFAULT @@ -250,7 +245,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: closemessage call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast - setvar VAR_0x8004, LOCALID_SS_TIDAL + setvar VAR_0x8004, LOCALID_LILYCOVE_HARBOR_SS_TIDAL call Common_EventScript_FerryDepart warp MAP_FARAWAY_ISLAND_ENTRANCE, 13, 38 waitstate @@ -305,14 +300,14 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 30 - removeobject LOCALID_FERRY_SAILOR + removeobject LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR delay 30 - applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_LILYCOVE_HARBOR_ATTENDANT, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - showobjectat LOCALID_ATTENDANT, MAP_LILYCOVE_CITY_HARBOR + showobjectat LOCALID_LILYCOVE_HARBOR_ATTENDANT, MAP_LILYCOVE_CITY_HARBOR delay 30 msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT release @@ -324,22 +319,22 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 - addobject LOCALID_FERRY_SAILOR + addobject LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR delay 30 - applymovement LOCALID_FERRY_SAILOR, Common_Movement_FacePlayer + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_FacePlayer waitmovement 0 return LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: - applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 30 - removeobject LOCALID_FERRY_SAILOR + removeobject LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 hideobjectat OBJ_EVENT_ID_PLAYER, 0 - setvar VAR_0x8004, LOCALID_SS_TIDAL + setvar VAR_0x8004, LOCALID_LILYCOVE_HARBOR_SS_TIDAL call Common_EventScript_FerryDepart return @@ -399,7 +394,7 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 hideobjectat OBJ_EVENT_ID_PLAYER, 0 - setvar VAR_0x8004, LOCALID_SS_TIDAL + setvar VAR_0x8004, LOCALID_LILYCOVE_HARBOR_SS_TIDAL call Common_EventScript_FerryDepart return @@ -445,12 +440,12 @@ LilycoveCity_Harbor_EventScript_SailorFerryAvailable:: end LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth:: - applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth waitmovement 0 return LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast:: - applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayEast + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayEast waitmovement 0 return @@ -468,36 +463,36 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast: step_end LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: - applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: - applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: - applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: - applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: - applymovement LOCALID_BRINEY, LilycoveCity_Harbor_Movement_BrineyBoardFerry + applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, LilycoveCity_Harbor_Movement_BrineyBoardFerry applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth - applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth waitmovement 0 return LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast:: - applymovement LOCALID_BRINEY, LilycoveCity_Harbor_Movement_BrineyBoardFerry + applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, LilycoveCity_Harbor_Movement_BrineyBoardFerry applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast - applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast + applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast waitmovement 0 return diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 1710e0df8f67..6b44c299feb8 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -28,6 +28,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MUSEUM_1F_CURATOR", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 2, @@ -106,6 +107,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, { + "local_id": "LOCALID_MUSEUM_1F_ARTIST_2", "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 19, "y": 3, diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 2d9d446f9d51..1802be417df6 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_CURATOR, 2 -.set LOCALID_ARTIST_2, 8 - LilycoveCity_LilycoveMuseum_1F_MapScripts:: .byte 0 @@ -10,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter:: LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: lockall - applymovement LOCALID_CURATOR, Common_Movement_FacePlayer + applymovement LOCALID_MUSEUM_1F_CURATOR, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings waitmessage multichoice 20, 8, MULTI_VIEWED_PAINTINGS, TRUE @@ -35,9 +32,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN - applymovement LOCALID_CURATOR, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs + applymovement LOCALID_MUSEUM_1F_CURATOR, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs waitmovement 0 - removeobject LOCALID_CURATOR + removeobject LOCALID_MUSEUM_1F_CURATOR switch VAR_FACING case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest @@ -152,7 +149,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARTIST_2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MUSEUM_1F_ARTIST_2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 83fe63aab01b..be3467f2d17d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MUSEUM_2F_CURATOR", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 10, "y": 8, diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 9212ca67df1e..196a48aeb855 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_CURATOR, 1 - LilycoveCity_LilycoveMuseum_2F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_OnFrame @@ -64,16 +62,16 @@ LilycoveCity_LilycoveMuseum_2F_OnFrame: LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: lockall - applymovement LOCALID_CURATOR, Common_Movement_FacePlayer + applymovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN - applymovement LOCALID_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + applymovement LOCALID_MUSEUM_2F_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN - applymovement LOCALID_CURATOR, Common_Movement_FacePlayer + applymovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 @@ -109,16 +107,16 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: end LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: - applymovement LOCALID_CURATOR, Common_Movement_FacePlayer + applymovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT - applymovement LOCALID_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + applymovement LOCALID_MUSEUM_2F_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall msgbox LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests, MSGBOX_DEFAULT goto LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament end LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: - applymovement LOCALID_CURATOR, Common_Movement_FacePlayer + applymovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT givedecoration DECOR_GLASS_ORNAMENT goto_if_eq VAR_RESULT, FALSE, LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 8af2eae11475..02d5ab06dbd6 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_RIVALS_HOUSE_2F_RIVAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 1, "y": 1, diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index ef8e83bf7e9e..cc8db687c7b2 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - LittlerootTown_MaysHouse_2F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp @@ -22,8 +20,8 @@ LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: checkplayergender goto_if_eq VAR_RESULT, FEMALE, LittlerootTown_MaysHouse_2F_EventScript_Ret goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_MaysHouse_2F_EventScript_Ret - setobjectxyperm LOCALID_RIVAL, 8, 2 - setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_RIVALS_HOUSE_2F_RIVAL, 8, 2 + setobjectmovementtype LOCALID_RIVALS_HOUSE_2F_RIVAL, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_2F_EventScript_Ret:: @@ -56,13 +54,13 @@ LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: delay 10 - addobject LOCALID_RIVAL - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayEnters + addobject LOCALID_RIVALS_HOUSE_2F_RIVAL + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayEnters waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_ENCOUNTER_MAY, TRUE @@ -80,49 +78,49 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: end LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth waitmovement 0 return LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth waitmovement 0 return LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest waitmovement 0 return LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast - applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast + applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast waitmovement 0 return diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index d426affdec02..f257ebaf5c73 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_GROUDON", "graphics_id": "OBJ_EVENT_GFX_GROUDON_FRONT", "x": 16, "y": 17, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON" }, { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 31, "y": 22, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 30, "y": 13, @@ -54,6 +57,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 26, "y": 13, @@ -67,6 +71,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_TABITHA", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 22, "y": 4, @@ -80,6 +85,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_MAXIE", "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 16, "y": 21, @@ -93,6 +99,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { + "local_id": "LOCALID_MAGMA_HIDEOUT_4F_GROUDON_SLEEPING", "graphics_id": "OBJ_EVENT_GFX_GROUDON_ASLEEP", "x": 16, "y": 17, diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ef29d1180a68..1ec622d0ddd9 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -1,11 +1,3 @@ -.set LOCALID_GROUDON, 1 -.set LOCALID_GRUNT_1, 2 -.set LOCALID_GRUNT_2, 3 -.set LOCALID_GRUNT_3, 4 -.set LOCALID_TABITHA, 5 -.set LOCALID_MAXIE, 6 -.set LOCALID_GROUDON_SLEEPING, 7 - MagmaHideout_4F_MapScripts:: .byte 0 @@ -26,11 +18,11 @@ MagmaHideout_4F_EventScript_Maxie:: applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 150 - removeobject LOCALID_GROUDON_SLEEPING - addobject LOCALID_GROUDON + removeobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON_SLEEPING + addobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON waitstate delay 60 - applymovement LOCALID_GROUDON, MagmaHideout_4F_Movement_GroudonApproach + applymovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonApproach waitmovement 0 special FadeOutOrbEffect waitstate @@ -40,9 +32,9 @@ MagmaHideout_4F_EventScript_Maxie:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_GROUDON, MagmaHideout_4F_Movement_GroudonExit + applymovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonExit waitmovement 0 - removeobject LOCALID_GROUDON + removeobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON delay 4 setvar VAR_0x8004, 2 @ vertical pan setvar VAR_0x8005, 2 @ horizontal pan @@ -51,14 +43,14 @@ MagmaHideout_4F_EventScript_Maxie:: special ShakeCamera waitstate delay 30 - applymovement LOCALID_MAXIE, MagmaHideout_4F_Movement_MaxieLookAround + applymovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, MagmaHideout_4F_Movement_MaxieLookAround waitmovement 0 msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 30 - applymovement LOCALID_MAXIE, Common_Movement_FacePlayer + applymovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, Common_Movement_FacePlayer waitmovement 0 msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT closemessage @@ -71,11 +63,11 @@ MagmaHideout_4F_EventScript_Maxie:: setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setvar VAR_SLATEPORT_HARBOR_STATE, 1 fadescreen FADE_TO_BLACK - removeobject LOCALID_MAXIE - removeobject LOCALID_GRUNT_1 - removeobject LOCALID_GRUNT_2 - removeobject LOCALID_GRUNT_3 - removeobject LOCALID_TABITHA + removeobject LOCALID_MAGMA_HIDEOUT_4F_MAXIE + removeobject LOCALID_MAGMA_HIDEOUT_4F_GRUNT_1 + removeobject LOCALID_MAGMA_HIDEOUT_4F_GRUNT_2 + removeobject LOCALID_MAGMA_HIDEOUT_4F_GRUNT_3 + removeobject LOCALID_MAGMA_HIDEOUT_4F_TABITHA setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS fadescreen FADE_FROM_BLACK releaseall diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 3430b2da0d61..6e59768d5b3b 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MARINE_CAVE_KYOGRE", "graphics_id": "OBJ_EVENT_GFX_KYOGRE_FRONT", "x": 9, "y": 22, diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index a7ff58369553..b246038bb331 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_KYOGRE, 1 - MarineCave_End_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition @@ -12,7 +10,7 @@ MarineCave_End_OnResume: MarineCave_End_EventScript_TryRemoveKyogre:: specialvar VAR_RESULT, GetBattleOutcome goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn - removeobject LOCALID_KYOGRE + removeobject LOCALID_MARINE_CAVE_KYOGRE return MarineCave_End_OnTransition: @@ -28,13 +26,13 @@ MarineCave_End_EventScript_Kyogre:: lockall applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement LOCALID_KYOGRE, MarineCave_End_Movement_KyogreApproach + applymovement LOCALID_MARINE_CAVE_KYOGRE, MarineCave_End_Movement_KyogreApproach waitmovement 0 waitse playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER delay 40 waitmoncry - setvar VAR_LAST_TALKED, LOCALID_KYOGRE + setvar VAR_LAST_TALKED, LOCALID_MARINE_CAVE_KYOGRE setwildbattle SPECIES_KYOGRE, 70 setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index e0d32c580480..7aa0e579ce5a 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -67,6 +67,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" }, { + "local_id": "LOCALID_METEOR_FALLS_MAGMA_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 20, @@ -80,6 +81,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, { + "local_id": "LOCALID_METEOR_FALLS_MAGMA_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 14, "y": 21, @@ -93,6 +95,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, { + "local_id": "LOCALID_METEOR_FALLS_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 6, "y": 20, @@ -106,6 +109,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { + "local_id": "LOCALID_METEOR_FALLS_AQUA_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 20, @@ -119,6 +123,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { + "local_id": "LOCALID_METEOR_FALLS_AQUA_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 21, diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index b81f5de267e8..9ac00f57e55c 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,9 +1,3 @@ -.set LOCALID_MAGMA_GRUNT_1, 5 -.set LOCALID_MAGMA_GRUNT_2, 6 -.set LOCALID_ARCHIE, 7 -.set LOCALID_AQUA_GRUNT_1, 8 -.set LOCALID_AQUA_GRUNT_2, 9 - MeteorFalls_1F_1R_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad .byte 0 @@ -25,70 +19,70 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 - applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceDown + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterUp - applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterUp waitmovement 0 playse SE_PIN - applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_ExclamationMark + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_Delay48 + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer waitmovement 0 msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 - addobject LOCALID_ARCHIE - addobject LOCALID_AQUA_GRUNT_1 - addobject LOCALID_AQUA_GRUNT_2 + addobject LOCALID_METEOR_FALLS_ARCHIE + addobject LOCALID_METEOR_FALLS_AQUA_GRUNT_1 + addobject LOCALID_METEOR_FALLS_AQUA_GRUNT_2 playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive - applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive - applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive + applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive + applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive + applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive waitmovement 0 - applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay - applymovement LOCALID_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit - applymovement LOCALID_MAGMA_GRUNT_2, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit + applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit waitmovement 0 - removeobject LOCALID_MAGMA_GRUNT_1 - removeobject LOCALID_MAGMA_GRUNT_2 - applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer + removeobject LOCALID_METEOR_FALLS_MAGMA_GRUNT_1 + removeobject LOCALID_METEOR_FALLS_MAGMA_GRUNT_2 + applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer waitmovement 0 msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT closemessage - applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie - applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie + applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie + applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie waitmovement 0 msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieExit - applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit - applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit + applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieExit + applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit + applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit waitmovement 0 fadedefaultbgm - removeobject LOCALID_ARCHIE - removeobject LOCALID_AQUA_GRUNT_1 - removeobject LOCALID_AQUA_GRUNT_2 + removeobject LOCALID_METEOR_FALLS_ARCHIE + removeobject LOCALID_METEOR_FALLS_AQUA_GRUNT_1 + removeobject LOCALID_METEOR_FALLS_AQUA_GRUNT_2 setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_MET_ARCHIE_METEOR_FALLS setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index 8e329fc0d3f9..69520324c690 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_METEOR_FALLS_STEVEN", "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 19, "y": 3, diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index a1c9e74ecead..de24d35124c8 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_STEVEN, 1 - MeteorFalls_StevensCave_MapScripts:: .byte 0 @@ -8,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_Steven:: goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated waitse playse SE_PIN - applymovement LOCALID_STEVEN, Common_Movement_ExclamationMark + applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_STEVEN, Common_Movement_Delay48 + applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_STEVEN, Common_Movement_FacePlayer + applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat @@ -22,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_Steven:: end MeteorFalls_StevensCave_EventScript_Defeated:: - applymovement LOCALID_STEVEN, Common_Movement_FacePlayer + applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT release diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index fb375f6ae1ec..a1873a9c5477 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MIRAGE_ROOT_FOSSIL", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 5, "y": 4, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, { + "local_id": "LOCALID_MIRAGE_CLAW_FOSSIL", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 7, "y": 4, diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 61bde877c512..57280b9d030f 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_ROOT_FOSSIL, 1 -.set LOCALID_CLAW_FOSSIL, 2 - MirageTower_4F_MapScripts:: .byte 0 @@ -13,7 +10,7 @@ MirageTower_4F_EventScript_RootFossil:: closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL - removeobject LOCALID_ROOT_FOSSIL + removeobject LOCALID_MIRAGE_ROOT_FOSSIL delay 30 setflag FLAG_CHOSE_ROOT_FOSSIL goto MirageTower_4F_EventScript_CollapseMirageTower @@ -33,7 +30,7 @@ MirageTower_4F_EventScript_ClawFossil:: closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL - removeobject LOCALID_CLAW_FOSSIL + removeobject LOCALID_MIRAGE_CLAW_FOSSIL delay 30 setflag FLAG_CHOSE_CLAW_FOSSIL goto MirageTower_4F_EventScript_CollapseMirageTower diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 232cbda81436..993f0c55205a 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -148,6 +148,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MOSSDEEP_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 23, @@ -161,6 +162,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { + "local_id": "LOCALID_MOSSDEEP_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 24, @@ -174,6 +176,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { + "local_id": "LOCALID_MOSSDEEP_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 25, @@ -187,6 +190,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { + "local_id": "LOCALID_MOSSDEEP_GRUNT_4", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 26, @@ -200,6 +204,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { + "local_id": "LOCALID_MOSSDEEP_MAXIE", "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 45, "y": 25, @@ -226,6 +231,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MOSSDEEP_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 61, "y": 29, diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index a03b1db8201a..10e520e34756 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,10 +1,3 @@ -.set LOCALID_GRUNT_1, 10 -.set LOCALID_GRUNT_2, 11 -.set LOCALID_GRUNT_3, 12 -.set LOCALID_GRUNT_4, 13 -.set LOCALID_MAXIE, 14 -.set LOCALID_SCOTT, 16 - MossdeepCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_OnTransition .byte 0 @@ -82,24 +75,24 @@ MossdeepCity_EventScript_VisitedMossdeep:: MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: lockall - applymovement LOCALID_MAXIE, MossdeepCity_Movement_MaxieGestureToSpaceCenter + applymovement LOCALID_MOSSDEEP_MAXIE, MossdeepCity_Movement_MaxieGestureToSpaceCenter waitmovement 0 - applymovement LOCALID_GRUNT_1, MossdeepCity_Movement_GruntFaceSpaceCenter - applymovement LOCALID_GRUNT_2, MossdeepCity_Movement_GruntFaceSpaceCenter - applymovement LOCALID_GRUNT_3, MossdeepCity_Movement_GruntFaceSpaceCenter - applymovement LOCALID_GRUNT_4, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_1, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_2, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_3, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_4, MossdeepCity_Movement_GruntFaceSpaceCenter waitmovement 0 - applymovement LOCALID_MAXIE, MossdeepCity_Movement_MaxieEnterSpaceCenter - applymovement LOCALID_GRUNT_1, MossdeepCity_Movement_Grunt1EnterSpaceCenter - applymovement LOCALID_GRUNT_2, MossdeepCity_Movement_Grunt2EnterSpaceCenter - applymovement LOCALID_GRUNT_3, MossdeepCity_Movement_Grunt3EnterSpaceCenter - applymovement LOCALID_GRUNT_4, MossdeepCity_Movement_Grunt4EnterSpaceCenter + applymovement LOCALID_MOSSDEEP_MAXIE, MossdeepCity_Movement_MaxieEnterSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_1, MossdeepCity_Movement_Grunt1EnterSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_2, MossdeepCity_Movement_Grunt2EnterSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_3, MossdeepCity_Movement_Grunt3EnterSpaceCenter + applymovement LOCALID_MOSSDEEP_GRUNT_4, MossdeepCity_Movement_Grunt4EnterSpaceCenter waitmovement 0 - removeobject LOCALID_MAXIE - removeobject LOCALID_GRUNT_1 - removeobject LOCALID_GRUNT_2 - removeobject LOCALID_GRUNT_3 - removeobject LOCALID_GRUNT_4 + removeobject LOCALID_MOSSDEEP_MAXIE + removeobject LOCALID_MOSSDEEP_GRUNT_1 + removeobject LOCALID_MOSSDEEP_GRUNT_2 + removeobject LOCALID_MOSSDEEP_GRUNT_3 + removeobject LOCALID_MOSSDEEP_GRUNT_4 delay 30 setvar VAR_MOSSDEEP_CITY_STATE, 2 setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA @@ -263,19 +256,19 @@ MossdeepCity_EventScript_Scott:: call_if_eq VAR_FACING, DIR_NORTH, MossdeepCity_EventScript_ScottExitNorth call_if_eq VAR_FACING, DIR_EAST, MossdeepCity_EventScript_ScottExitEast addvar VAR_SCOTT_STATE, 1 - removeobject LOCALID_SCOTT + removeobject LOCALID_MOSSDEEP_SCOTT release end MossdeepCity_EventScript_ScottExitNorth:: applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit - applymovement LOCALID_SCOTT, MossdeepCity_Movement_ScottExitNorth + applymovement LOCALID_MOSSDEEP_SCOTT, MossdeepCity_Movement_ScottExitNorth waitmovement 0 return MossdeepCity_EventScript_ScottExitEast:: applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit - applymovement LOCALID_SCOTT, MossdeepCity_Movement_ScottExitEast + applymovement LOCALID_MOSSDEEP_SCOTT, MossdeepCity_Movement_ScottExitEast waitmovement 0 return diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index a8a03ed95880..8bd4a210e3ef 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -41,6 +41,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MOSSDEEP_HOUSE_WINGULL", "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 4, "y": 5, diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 56a8381963ef..0317753560c3 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_WINGULL, 3 - MossdeepCity_House2_MapScripts:: .byte 0 @@ -23,17 +21,17 @@ MossdeepCity_House2_EventScript_Wingull:: clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL call_if_eq VAR_FACING, DIR_NORTH, MossdeepCity_House2_EventScript_WingullExitNorth call_if_eq VAR_FACING, DIR_WEST, MossdeepCity_House2_EventScript_WingullExitWest - removeobject LOCALID_WINGULL + removeobject LOCALID_MOSSDEEP_HOUSE_WINGULL release end MossdeepCity_House2_EventScript_WingullExitNorth:: - applymovement LOCALID_WINGULL, MossdeepCity_House2_Movement_WingullExitNorth + applymovement LOCALID_MOSSDEEP_HOUSE_WINGULL, MossdeepCity_House2_Movement_WingullExitNorth waitmovement 0 return MossdeepCity_House2_EventScript_WingullExitWest:: - applymovement LOCALID_WINGULL, MossdeepCity_House2_Movement_WingullExitEast + applymovement LOCALID_MOSSDEEP_HOUSE_WINGULL, MossdeepCity_House2_Movement_WingullExitEast waitmovement 0 return diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index e7f47bcfb88c..f6b04f5f2fc3 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SPACE_CENTER_1F_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 7, "y": 2, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SPACE_CENTER_1F_SCIENTIST_2", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 2, @@ -41,6 +43,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SPACE_CENTER_1F_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 6, @@ -54,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SPACE_CENTER_1F_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 10, "y": 2, @@ -67,6 +71,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SPACE_CENTER_1F_WOMAN", "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 14, "y": 7, @@ -119,6 +124,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { + "local_id": "LOCALID_SPACE_CENTER_1F_STAIR_GRUNT", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 13, "y": 2, diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index e17af3572452..0ed531ba4b6f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,10 +1,3 @@ -.set LOCALID_SCIENTIST_1, 1 -.set LOCALID_SCIENTIST_2, 2 -.set LOCALID_SAILOR, 3 -.set LOCALID_OLD_MAN, 4 -.set LOCALID_WOMAN, 5 -.set LOCALID_STAIR_GRUNT, 9 - MossdeepCity_SpaceCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition @@ -15,31 +8,31 @@ MossdeepCity_SpaceCenter_1F_OnTransition: end MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma:: - setobjectxyperm LOCALID_SAILOR, 1, 9 - setobjectmovementtype LOCALID_SAILOR, MOVEMENT_TYPE_FACE_RIGHT - setobjectxyperm LOCALID_WOMAN, 0, 8 - setobjectmovementtype LOCALID_WOMAN, MOVEMENT_TYPE_FACE_RIGHT - setobjectxyperm LOCALID_OLD_MAN, 1, 6 - setobjectmovementtype LOCALID_OLD_MAN, MOVEMENT_TYPE_FACE_RIGHT - setobjectxyperm LOCALID_SCIENTIST_1, 3, 4 - setobjectmovementtype LOCALID_SCIENTIST_1, MOVEMENT_TYPE_FACE_RIGHT - setobjectmovementtype LOCALID_SCIENTIST_2, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SPACE_CENTER_1F_SAILOR, 1, 9 + setobjectmovementtype LOCALID_SPACE_CENTER_1F_SAILOR, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SPACE_CENTER_1F_WOMAN, 0, 8 + setobjectmovementtype LOCALID_SPACE_CENTER_1F_WOMAN, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SPACE_CENTER_1F_OLD_MAN, 1, 6 + setobjectmovementtype LOCALID_SPACE_CENTER_1F_OLD_MAN, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SPACE_CENTER_1F_SCIENTIST_1, 3, 4 + setobjectmovementtype LOCALID_SPACE_CENTER_1F_SCIENTIST_1, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype LOCALID_SPACE_CENTER_1F_SCIENTIST_2, MOVEMENT_TYPE_FACE_RIGHT goto_if_eq VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1, MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft goto_if_eq VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown goto_if_eq VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3, MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight end MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft:: - setobjectxyperm LOCALID_STAIR_GRUNT, 12, 2 + setobjectxyperm LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, 12, 2 end MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown:: - setobjectxyperm LOCALID_STAIR_GRUNT, 13, 3 + setobjectxyperm LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, 13, 3 end @ Functionally unused. See comment on MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight:: - setobjectxyperm LOCALID_STAIR_GRUNT, 14, 2 + setobjectxyperm LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, 14, 2 end MossdeepCity_SpaceCenter_1F_OnLoad: @@ -226,7 +219,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_2, MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F - copyobjectxytoperm LOCALID_STAIR_GRUNT + copyobjectxytoperm LOCALID_SPACE_CENTER_1F_STAIR_GRUNT switch VAR_FACING case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest #ifdef BUGFIX @@ -234,7 +227,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: #else case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast #endif - applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs + applymovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs waitmovement 0 setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 release @@ -246,7 +239,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated:: end MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: - applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest + applymovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest waitmovement 0 setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1 release @@ -255,7 +248,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ Functionally unused by mistake. The movement is handled anyway after the switch (see above) @ This also means VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE can never be 3 MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast:: - applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast + applymovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast waitmovement 0 setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3 release diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 55bd065cb68d..e4cf247d0e70 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MT_CHIMNEY_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 24, "y": 19, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { + "local_id": "LOCALID_MT_CHIMNEY_MAXIE", "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 13, "y": 6, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { + "local_id": "LOCALID_MT_CHIMNEY_TABITHA", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 11, @@ -288,6 +291,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { + "local_id": "LOCALID_MT_CHIMNEY_MAGMA_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 9, "y": 16, @@ -379,6 +383,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { + "local_id": "LOCALID_MT_CHIMNEY_MAGMA_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 13, "y": 16, diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 1931633258c0..fa5e5ff172a0 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,10 +1,3 @@ -.set LOCALID_ARCHIE, 1 -.set LOCALID_MAXIE, 2 -.set LOCALID_TABITHA, 3 -.set LOCALID_MAGMA_GRUNT_2, 22 -.set LOCALID_MAGMA_GRUNT_1, 29 - - MtChimney_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, MtChimney_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition @@ -24,7 +17,7 @@ MtChimney_EventScript_Archie:: call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieBusyFighting closemessage - applymovement LOCALID_ARCHIE, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MT_CHIMNEY_ARCHIE, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -42,12 +35,12 @@ MtChimney_EventScript_Maxie:: lockall playbgm MUS_ENCOUNTER_MAGMA, FALSE msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT - applymovement LOCALID_MAXIE, Common_Movement_FacePlayer + applymovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement LOCALID_MAXIE, Common_Movement_ExclamationMark + applymovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_MAXIE, Common_Movement_Delay48 + applymovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat @@ -55,14 +48,14 @@ MtChimney_EventScript_Maxie:: closemessage delay 30 fadescreen FADE_TO_BLACK - removeobject LOCALID_MAXIE - removeobject LOCALID_MAGMA_GRUNT_1 - removeobject LOCALID_TABITHA - removeobject LOCALID_MAGMA_GRUNT_2 + removeobject LOCALID_MT_CHIMNEY_MAXIE + removeobject LOCALID_MT_CHIMNEY_MAGMA_GRUNT_1 + removeobject LOCALID_MT_CHIMNEY_TABITHA + removeobject LOCALID_MT_CHIMNEY_MAGMA_GRUNT_2 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA fadescreen FADE_FROM_BLACK - setobjectxyperm LOCALID_ARCHIE, 10, 12 - addobject LOCALID_ARCHIE + setobjectxyperm LOCALID_MT_CHIMNEY_ARCHIE, 10, 12 + addobject LOCALID_MT_CHIMNEY_ARCHIE call_if_eq VAR_FACING, DIR_EAST, MtChimney_EventScript_ArchieApproachPlayerEast call_if_eq VAR_FACING, DIR_NORTH, MtChimney_EventScript_ArchieApproachPlayerNorth applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft @@ -71,7 +64,7 @@ MtChimney_EventScript_Maxie:: closemessage call_if_eq VAR_FACING, DIR_EAST, MtChimney_EventScript_ArchieExitEast call_if_eq VAR_FACING, DIR_NORTH, MtChimney_EventScript_ArchieExitNorth - removeobject LOCALID_ARCHIE + removeobject LOCALID_MT_CHIMNEY_ARCHIE setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY clearflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO @@ -81,22 +74,22 @@ MtChimney_EventScript_Maxie:: end MtChimney_EventScript_ArchieApproachPlayerEast:: - applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieApproachPlayerEast + applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieApproachPlayerEast waitmovement 0 return MtChimney_EventScript_ArchieApproachPlayerNorth:: - applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieApproachPlayerNorth + applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieApproachPlayerNorth waitmovement 0 return MtChimney_EventScript_ArchieExitEast:: - applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieExitEast + applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieExitEast waitmovement 0 return MtChimney_EventScript_ArchieExitNorth:: - applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieExitNorth + applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieExitNorth waitmovement 0 return diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 49fd8b9f72e9..7a2cccdd3681 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -28,6 +28,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 23, "y": 6, @@ -41,6 +42,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_OLD_LADY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 23, "y": 5, @@ -54,6 +56,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 15, @@ -67,6 +70,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 25, "y": 18, @@ -80,6 +84,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 11, @@ -93,6 +98,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_GRUNT_4", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 25, "y": 11, @@ -106,6 +112,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { + "local_id": "LOCALID_MT_PYRE_SUMMIT_MAXIE", "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 23, "y": 6, diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 3de60df3f2fb..06c91fe38253 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,11 +1,3 @@ -.set LOCALID_ARCHIE, 2 -.set LOCALID_OLD_LADY, 3 -.set LOCALID_GRUNT_1, 4 -.set LOCALID_GRUNT_2, 5 -.set LOCALID_GRUNT_3, 6 -.set LOCALID_GRUNT_4, 7 -.set LOCALID_MAXIE, 8 - MtPyre_Summit_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_OnTransition .byte 0 @@ -15,8 +7,8 @@ MtPyre_Summit_OnTransition: end MtPyre_Summit_EventScript_SetArchieMaxiePositions:: - setobjectxyperm LOCALID_MAXIE, 23, 6 - setobjectxyperm LOCALID_ARCHIE, 22, 6 + setobjectxyperm LOCALID_MT_PYRE_SUMMIT_MAXIE, 23, 6 + setobjectxyperm LOCALID_MT_PYRE_SUMMIT_ARCHIE, 22, 6 end MtPyre_Summit_EventScript_TeamAquaTrigger0:: @@ -41,7 +33,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: playbgm MUS_ENCOUNTER_AQUA, FALSE applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 50 call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_ArchieFacePlayer0 @@ -50,11 +42,11 @@ MtPyre_Summit_EventScript_TeamAquaExits:: msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_ARCHIE - removeobject LOCALID_GRUNT_1 - removeobject LOCALID_GRUNT_2 - removeobject LOCALID_GRUNT_3 - removeobject LOCALID_GRUNT_4 + removeobject LOCALID_MT_PYRE_SUMMIT_ARCHIE + removeobject LOCALID_MT_PYRE_SUMMIT_GRUNT_1 + removeobject LOCALID_MT_PYRE_SUMMIT_GRUNT_2 + removeobject LOCALID_MT_PYRE_SUMMIT_GRUNT_3 + removeobject LOCALID_MT_PYRE_SUMMIT_GRUNT_4 setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA fadedefaultbgm @@ -72,7 +64,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: end MtPyre_Summit_EventScript_ArchieFacePlayer0:: - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer0 + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer0 waitmovement 0 return @@ -81,24 +73,24 @@ MtPyre_Summit_EventScript_ArchieFacePlayer1:: return MtPyre_Summit_EventScript_ArchieFacePlayer2:: - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer2 + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer2 waitmovement 0 return MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: - applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0 + applymovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: - applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer1 + applymovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer1 waitmovement 0 return MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: - applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2 + applymovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 @@ -211,9 +203,9 @@ MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_ArchieMaxieBeginExit1 call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_ArchieMaxieBeginExit2 playse SE_PIN - applymovement LOCALID_MAXIE, Common_Movement_ExclamationMark + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_MAXIE, Common_Movement_Delay48 + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, Common_Movement_Delay48 waitmovement 0 delay 30 call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_MaxieApproachPlayer0 @@ -225,78 +217,78 @@ MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_MaxieApproachArchie1 call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_MaxieApproachArchie2 delay 30 - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieExit + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieExit waitmovement 0 - removeobject LOCALID_ARCHIE - removeobject LOCALID_MAXIE + removeobject LOCALID_MT_PYRE_SUMMIT_ARCHIE + removeobject LOCALID_MT_PYRE_SUMMIT_MAXIE setvar VAR_MT_PYRE_STATE, 3 releaseall end MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieExit + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieExit waitmovement 0 return MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieExit + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieExit waitmovement 0 return MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieExit + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieExit waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer0:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer0 + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer0 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer1:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer1 + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer1 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer2:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie - applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer2 + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer2 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachArchie0:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie0 + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie0 waitmovement 0 - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachArchie1:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie1 + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie1 waitmovement 0 - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachArchie2:: applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie - applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie2 + applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie2 waitmovement 0 - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index ed0bb70dac1b..c3ca23d82d6a 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_NAVEL_ROCK_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 5, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_NAVEL_ROCK_SS_TIDAL", "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 7, diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index a981759175a3..fb12688e3264 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_SAILOR, 1 -.set LOCALID_SS_TIDAL, 2 - NavelRock_Harbor_MapScripts:: .byte 0 @@ -14,8 +11,8 @@ NavelRock_Harbor_EventScript_Sailor:: applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 30 - hideobjectat LOCALID_SAILOR, MAP_NAVEL_ROCK_HARBOR - setvar VAR_0x8004, LOCALID_SS_TIDAL + hideobjectat LOCALID_NAVEL_ROCK_SAILOR, MAP_NAVEL_ROCK_HARBOR + setvar VAR_0x8004, LOCALID_NAVEL_ROCK_SS_TIDAL call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 8, 11 waitstate diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 4bb86784e9c4..991d2e50ca43 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -44,6 +44,7 @@ "flag": "0" }, { + "local_id": "LOCALID_OLDALE_MART_EMPLOYEE", "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 13, "y": 7, @@ -57,6 +58,7 @@ "flag": "0" }, { + "local_id": "LOCALID_FOOTPRINTS_MAN", "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 9, @@ -70,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_OLDALE_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 19, diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index b2c25a6dfbc6..d19658dc134c 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_MART_EMPLOYEE, 2 -.set LOCALID_FOOTPRINTS_MAN, 3 -.set LOCALID_RIVAL, 4 - OldaleTown_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_OnTransition .byte 0 @@ -25,8 +21,8 @@ OldaleTown_EventScript_BlockWestEntrance:: return OldaleTown_EventScript_MoveMartEmployee:: - setobjectxyperm LOCALID_MART_EMPLOYEE, 13, 14 - setobjectmovementtype LOCALID_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_OLDALE_MART_EMPLOYEE, 13, 14 + setobjectmovementtype LOCALID_OLDALE_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN return OldaleTown_EventScript_TownSign:: @@ -53,14 +49,14 @@ OldaleTown_EventScript_MartEmployee:: end OldaleTown_EventScript_GoToMartSouth:: - applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeSouth + applymovement LOCALID_OLDALE_MART_EMPLOYEE, OldaleTown_Movement_EmployeeSouth applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerSouth waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart end OldaleTown_EventScript_GoToMartNorth:: - applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeNorth + applymovement LOCALID_OLDALE_MART_EMPLOYEE, OldaleTown_Movement_EmployeeNorth applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerNorth waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart @@ -68,7 +64,7 @@ OldaleTown_EventScript_GoToMartNorth:: OldaleTown_EventScript_GoToMartEast:: applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerEast - applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeEast + applymovement LOCALID_OLDALE_MART_EMPLOYEE, OldaleTown_Movement_EmployeeEast waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart end @@ -221,7 +217,7 @@ OldaleTown_EventScript_NotBlockingPath:: OldaleTown_EventScript_Rival:: lockall - applymovement LOCALID_RIVAL, Common_Movement_FacePlayer + applymovement LOCALID_OLDALE_RIVAL, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 goto OldaleTown_EventScript_ShowRivalMessage @@ -229,7 +225,7 @@ OldaleTown_EventScript_Rival:: OldaleTown_EventScript_RivalTrigger1:: lockall - applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer1 + applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -239,7 +235,7 @@ OldaleTown_EventScript_RivalTrigger1:: OldaleTown_EventScript_RivalTrigger2:: lockall - applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer2 + applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer2 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -249,7 +245,7 @@ OldaleTown_EventScript_RivalTrigger2:: OldaleTown_EventScript_RivalTrigger3:: lockall - applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer3 + applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer3 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -277,9 +273,9 @@ OldaleTown_EventScript_RivalFinish:: closemessage call_if_eq VAR_0x8009, 0, OldaleTown_EventScript_DoExitMovement1 call_if_eq VAR_0x8009, 1, OldaleTown_EventScript_DoExitMovement2 - applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit + applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit waitmovement 0 - removeobject LOCALID_RIVAL + removeobject LOCALID_OLDALE_RIVAL setvar VAR_OLDALE_RIVAL_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL releaseall @@ -287,13 +283,13 @@ OldaleTown_EventScript_RivalFinish:: OldaleTown_EventScript_DoExitMovement1:: goto_if_ne VAR_FACING, DIR_SOUTH, OldaleTown_EventScript_DoExitMovement2 - applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit + applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit waitmovement 0 return OldaleTown_EventScript_DoExitMovement2:: applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_WatchRivalExit - applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit + applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit waitmovement 0 return diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index f98fdb3dd7b4..08f661ce97c6 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_PACIFIDLOG_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 32db89f8dc00..78ea62594a09 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NURSE, 1 - PacifidlogTown_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -10,7 +8,7 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: end PacifidlogTown_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_PACIFIDLOG_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 63e02e8955b7..57238192dc0c 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -39,6 +39,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM" }, { + "local_id": "LOCALID_PETALBURG_WALLY", "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 15, "y": 10, @@ -52,6 +53,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" }, { + "local_id": "LOCALID_PETALBURG_BOY", "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, @@ -78,6 +80,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PETALBURG_WALLYS_DAD", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 15, "y": 10, @@ -117,6 +120,7 @@ "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" }, { + "local_id": "LOCALID_GYM_BOY", "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 15, @@ -130,6 +134,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PETALBURG_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 13, "y": 12, diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index a9dd1014f265..45487bcd46dc 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,9 +1,3 @@ -.set LOCALID_WALLY, 2 -.set LOCALID_BOY, 3 -.set LOCALID_WALLYS_DAD, 5 -.set LOCALID_GYM_BOY, 8 -.set LOCALID_SCOTT, 9 - PetalburgCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame @@ -39,15 +33,15 @@ PetalburgCity_EventScript_WallyTutorial:: lockall special SavePlayerParty special LoadWallyZigzagoon - applymovement LOCALID_WALLY, PetalburgCity_Movement_WallyTutorialWally + applymovement LOCALID_PETALBURG_WALLY, PetalburgCity_Movement_WallyTutorialWally applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer waitmovement 0 msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT special StartWallyTutorialBattle waitstate msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT - applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterLeft, MAP_PETALBURG_CITY - waitmovement LOCALID_WALLY, MAP_PETALBURG_CITY + applymovement LOCALID_PETALBURG_WALLY, Common_Movement_WalkInPlaceFasterLeft, MAP_PETALBURG_CITY + waitmovement LOCALID_PETALBURG_WALLY, MAP_PETALBURG_CITY msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -64,14 +58,14 @@ PetalburgCity_EventScript_WallyTutorial:: PetalburgCity_EventScript_WalkToWallyHouse:: lockall setflag FLAG_HIDE_MAP_NAME_POPUP - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad + applymovement LOCALID_PETALBURG_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad + applymovement LOCALID_PETALBURG_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD @@ -91,7 +85,7 @@ PetalburgCity_EventScript_Boy:: faceplayer msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection + applymovement LOCALID_PETALBURG_BOY, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -504,57 +498,57 @@ PetalburgCity_Movement_PlayerWalkToGym3: PetalburgCity_EventScript_Scott0:: lockall - addobject LOCALID_SCOTT + addobject LOCALID_PETALBURG_SCOTT setvar VAR_0x8008, 0 - setobjectxy LOCALID_SCOTT, 13, 10 + setobjectxy LOCALID_PETALBURG_SCOTT, 13, 10 goto PetalburgCity_EventScript_Scott end PetalburgCity_EventScript_Scott1:: lockall - addobject LOCALID_SCOTT + addobject LOCALID_PETALBURG_SCOTT setvar VAR_0x8008, 1 - setobjectxy LOCALID_SCOTT, 13, 11 + setobjectxy LOCALID_PETALBURG_SCOTT, 13, 11 goto PetalburgCity_EventScript_Scott end PetalburgCity_EventScript_Scott2:: lockall - addobject LOCALID_SCOTT + addobject LOCALID_PETALBURG_SCOTT setvar VAR_0x8008, 2 - setobjectxy LOCALID_SCOTT, 13, 12 + setobjectxy LOCALID_PETALBURG_SCOTT, 13, 12 goto PetalburgCity_EventScript_Scott end PetalburgCity_EventScript_Scott3:: lockall - addobject LOCALID_SCOTT + addobject LOCALID_PETALBURG_SCOTT setvar VAR_0x8008, 3 - setobjectxy LOCALID_SCOTT, 13, 13 + setobjectxy LOCALID_PETALBURG_SCOTT, 13, 13 goto PetalburgCity_EventScript_Scott end PetalburgCity_EventScript_Scott:: - applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft + applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft waitmovement 0 playse SE_PIN - applymovement LOCALID_SCOTT, Common_Movement_ExclamationMark + applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_SCOTT, Common_Movement_Delay48 + applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottApproachPlayer + applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 30 msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT @@ -564,31 +558,31 @@ PetalburgCity_EventScript_Scott:: call_if_eq VAR_0x8008, 2, PetalburgCity_EventScript_ScottExit2 call_if_eq VAR_0x8008, 3, PetalburgCity_EventScript_ScottExit3 setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1 - removeobject LOCALID_SCOTT + removeobject LOCALID_PETALBURG_SCOTT releaseall end PetalburgCity_EventScript_ScottExit0:: applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 - applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit0 + applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit0 waitmovement 0 return PetalburgCity_EventScript_ScottExit1:: applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 - applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit1 + applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit1 waitmovement 0 return PetalburgCity_EventScript_ScottExit2:: applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 - applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit2 + applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit2 waitmovement 0 return PetalburgCity_EventScript_ScottExit3:: applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 - applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit3 + applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit3 waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index ef5849171339..ecc3176b2078 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_PETALBURG_GYM_NORMAN", "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 4, "y": 2, @@ -132,6 +133,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, { + "local_id": "LOCALID_PETALBURG_GYM_WALLY", "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 4, "y": 111, @@ -145,6 +147,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" }, { + "local_id": "LOCALID_PETALBURG_GYM_WALLYS_DAD", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 1, "y": 7, diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 8b107c68ec42..9c0a8a5bf300 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_NORMAN, 1 -.set LOCALID_WALLY, 10 -.set LOCALID_WALLYS_DAD, 11 - PetalburgCity_Gym_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition @@ -46,11 +42,11 @@ PetalburgCity_Gym_OnTransition: end PetalburgCity_Gym_EventScript_MoveWallyToEntrance:: - setobjectxyperm LOCALID_WALLY, 5, 108 + setobjectxyperm LOCALID_PETALBURG_GYM_WALLY, 5, 108 return PetalburgCity_Gym_EventScript_MoveNormanToEntrance:: - setobjectxyperm LOCALID_NORMAN, 4, 107 + setobjectxyperm LOCALID_PETALBURG_GYM_NORMAN, 4, 107 return PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @@ -58,7 +54,7 @@ PetalburgCity_Gym_EventScript_CheckNormanForRematch:: specialvar VAR_RESULT, IsTrainerReadyForRematch goto_if_eq VAR_RESULT, TRUE, PetalburgCity_Gym_EventScript_DontMoveNormanToFront goto_if_eq VAR_PETALBURG_GYM_STATE, 8, PetalburgCity_Gym_EventScript_DontMoveNormanToFront - setobjectxyperm LOCALID_NORMAN, 4, 107 + setobjectxyperm LOCALID_PETALBURG_GYM_NORMAN, 4, 107 return PetalburgCity_Gym_EventScript_DontMoveNormanToFront:: @@ -83,10 +79,10 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_EXIT - removeobject LOCALID_WALLY + removeobject LOCALID_PETALBURG_GYM_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp @@ -144,7 +140,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorialEast:: end PetalburgCity_Gym_EventScript_BeginWallyTutorial:: - addobject LOCALID_WALLY + addobject LOCALID_PETALBURG_GYM_WALLY playse SE_DOOR call_if_eq VAR_0x8008, 0, PetalburgCity_Gym_EventScript_WallyArriveSouth call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_WallyArriveNorth @@ -182,7 +178,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth call_if_eq VAR_0x8008, 2, PetalburgCity_Gym_EventScript_ExitGymWithWallyWest call_if_eq VAR_0x8008, 3, PetalburgCity_Gym_EventScript_ExitGymWithWallyEast - removeobject LOCALID_WALLY + removeobject LOCALID_PETALBURG_GYM_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM setvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_PETALBURG_CITY_STATE, 2 @@ -196,101 +192,101 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: end PetalburgCity_Gym_EventScript_WallyArriveSouth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return PetalburgCity_Gym_EventScript_WallyArriveNorth:: - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth waitmovement 0 - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return PetalburgCity_Gym_EventScript_WallyArriveWestEast:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitNorth + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitNorth applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: - applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitEast + applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitEast applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PetalburgCity_Gym_EventScript_WallyFacePlayer:: - applymovement LOCALID_WALLY, Common_Movement_FacePlayer + applymovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_WallyFaceDown:: - applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -319,7 +315,7 @@ PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -397,7 +393,7 @@ PetalburgCity_Gym_EventScript_NormanBattle:: delay 40 playse SE_DOOR delay 10 - addobject LOCALID_WALLYS_DAD + addobject LOCALID_PETALBURG_GYM_WALLYS_DAD switch VAR_FACING case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysDadArrivesNorth case DIR_WEST, PetalburgCity_Gym_EventScript_WallysDadArrivesWest @@ -424,12 +420,12 @@ PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: goto PetalburgCity_Gym_EventScript_WallysDadArrives PetalburgCity_Gym_EventScript_WallysDadArrives:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym waitmovement 0 playse SE_PIN - applymovement LOCALID_WALLYS_DAD, Common_Movement_ExclamationMark + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_WALLYS_DAD, Common_Movement_Delay48 + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_Delay48 waitmovement 0 delay 10 call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth @@ -448,7 +444,7 @@ PetalburgCity_Gym_EventScript_WallysDadArrives:: call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth call_if_eq VAR_0x8008, 2, PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast call_if_eq VAR_0x8008, 3, PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest - removeobject LOCALID_WALLYS_DAD + removeobject LOCALID_PETALBURG_GYM_WALLYS_DAD setvar VAR_PETALBURG_CITY_STATE, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD warp MAP_PETALBURG_CITY, 15, 8 @@ -457,59 +453,59 @@ PetalburgCity_Gym_EventScript_WallysDadArrives:: end PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: - applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: - applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: - applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth - applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth + applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest:: - applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest + applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest waitmovement 0 return diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index 12b7810df942..ae19e848b358 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_PETALBURG_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 3dadd3184bac..032007dcfcbf 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NURSE, 1 - PetalburgCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -11,7 +9,7 @@ PetalburgCity_PokemonCenter_1F_OnTransition: end PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_PETALBURG_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index f2fd03e7ff01..8fb48df1ba9c 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_WALLYS_HOUSE_WALLYS_DAD", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 4, diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index f7e2e97828cb..21b2247bbd2e 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_WALLYS_DAD, 1 - PetalburgCity_WallysHouse_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_OnWarp @@ -11,7 +9,7 @@ PetalburgCity_WallysHouse_OnWarp: PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST - turnobject LOCALID_WALLYS_DAD, DIR_WEST + turnobject LOCALID_WALLYS_HOUSE_WALLYS_DAD, DIR_WEST end PetalburgCity_WallysHouse_OnFrame: diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 2979e7e46908..5b6fa65fa75e 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -41,6 +41,7 @@ "flag": "FLAG_TEMP_12" }, { + "local_id": "LOCALID_PETALBURG_WOODS_GRUNT", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 26, "y": 17, @@ -54,6 +55,7 @@ "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" }, { + "local_id": "LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE", "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 26, "y": 20, diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 94bd3901486d..85a90c73dcde 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -1,40 +1,37 @@ -.set LOCALID_GRUNT, 3 -.set LOCALID_DEVON_EMPLOYEE, 4 - PetalburgWoods_MapScripts:: .byte 0 PetalburgWoods_EventScript_DevonResearcherLeft:: lockall call PetalburgWoods_EventScript_DevonResearcherIntro - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaEntrance waitmovement 0 msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherLeft + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherLeft waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft waitmovement 0 msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachPlayer + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachPlayer waitmovement 0 msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaBackOff + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaBackOff waitmovement 0 call PetalburgWoods_EventScript_DevonResearcherPostBattle applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherExitLeft + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherExitLeft waitmovement 0 goto PetalburgWoods_EventScript_RemoveDevonResearcher end @@ -42,41 +39,41 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: PetalburgWoods_EventScript_DevonResearcherRight:: lockall call PetalburgWoods_EventScript_DevonResearcherIntro - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaEntrance waitmovement 0 msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherRight + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherRight waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight waitmovement 0 msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaBackOff + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaBackOff waitmovement 0 call PetalburgWoods_EventScript_DevonResearcherPostBattle applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherExitRight + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherExitRight waitmovement 0 goto PetalburgWoods_EventScript_RemoveDevonResearcher end PetalburgWoods_EventScript_DevonResearcherIntro:: - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherLookAround + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherLookAround waitmovement 0 msgbox PetalburgWoods_Text_NotAOneToBeFound, MSGBOX_DEFAULT closemessage @@ -85,9 +82,9 @@ PetalburgWoods_EventScript_DevonResearcherIntro:: PetalburgWoods_EventScript_DevonResearcherPostBattle:: msgbox PetalburgWoods_Text_YouveGotSomeNerve, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaRunAway + applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaRunAway waitmovement 0 - removeobject LOCALID_GRUNT + removeobject LOCALID_PETALBURG_WOODS_GRUNT applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT @@ -103,14 +100,14 @@ PetalburgWoods_EventScript_BagFull:: PetalburgWoods_EventScript_DevonResearcherFinish:: msgbox PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro, MSGBOX_DEFAULT - applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherStartExit + applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherStartExit waitmovement 0 msgbox PetalburgWoods_Text_ICantBeWastingTime, MSGBOX_DEFAULT closemessage return PetalburgWoods_EventScript_RemoveDevonResearcher:: - removeobject LOCALID_DEVON_EMPLOYEE + removeobject LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 1abb23030bf6..d24d997151df 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -39,6 +39,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE101_BIRCH", "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 13, @@ -65,6 +66,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, { + "local_id": "LOCALID_ROUTE101_ZIGZAGOON", "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1", "x": 10, "y": 13, diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index dd0ef5dcec1d..6b926c9ee48c 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BIRCH, 2 -.set LOCALID_ZIGZAGOON, 4 - Route101_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame @@ -24,19 +21,19 @@ Route101_EventScript_StartBirchRescue:: playbgm MUS_HELP, TRUE msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT closemessage - setobjectxy LOCALID_BIRCH, 0, 15 - setobjectxy LOCALID_ZIGZAGOON, 0, 16 + setobjectxy LOCALID_ROUTE101_BIRCH, 0, 15 + setobjectxy LOCALID_ROUTE101_ZIGZAGOON, 0, 16 applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_EnterScene - applymovement LOCALID_BIRCH, Route101_Movement_BirchRunAway1 - applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonChase1 + applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchRunAway1 + applymovement LOCALID_ROUTE101_ZIGZAGOON, Route101_Movement_ZigzagoonChase1 waitmovement 0 - applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonChaseInCircles - applymovement LOCALID_BIRCH, Route101_Movement_BirchRunInCircles + applymovement LOCALID_ROUTE101_ZIGZAGOON, Route101_Movement_ZigzagoonChaseInCircles + applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchRunInCircles waitmovement 0 - applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ROUTE101_BIRCH, Common_Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonFaceBirch - applymovement LOCALID_BIRCH, Route101_Movement_BirchFaceZigzagoon + applymovement LOCALID_ROUTE101_ZIGZAGOON, Route101_Movement_ZigzagoonFaceBirch + applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchFaceZigzagoon waitmovement 0 msgbox Route101_Text_PleaseHelp, MSGBOX_DEFAULT closemessage @@ -224,13 +221,13 @@ Route101_EventScript_BirchsBag:: setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen FADE_TO_BLACK - removeobject LOCALID_ZIGZAGOON + removeobject LOCALID_ROUTE101_ZIGZAGOON setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 special ChooseStarter waitstate - applymovement LOCALID_BIRCH, Route101_Movement_BirchApproachPlayer + applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchApproachPlayer waitmovement 0 msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT special HealPlayerParty diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 80af8aa6d825..4a4679acd376 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -109,6 +109,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE104_BOAT", "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 54, @@ -122,6 +123,7 @@ "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" }, { + "local_id": "LOCALID_ROUTE104_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 51, @@ -460,6 +462,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE104_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 17, "y": 50, diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index dfb7675e9048..b5ac27010041 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,7 +1,3 @@ -@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map. -@ These are labeled in DewfordTown/scripts.inc -.set LOCALID_RIVAL, 34 - Route104_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition @@ -36,7 +32,7 @@ Route104_EventScript_TrySetRivalPos:: goto_if_ge VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_DontSetRivalPos goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_DontSetRivalPos goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_DontSetRivalPos - setobjectxyperm LOCALID_RIVAL, 17, 52 + setobjectxyperm LOCALID_ROUTE104_RIVAL, 17, 52 return Route104_EventScript_DontSetRivalPos:: @@ -45,7 +41,7 @@ Route104_EventScript_DontSetRivalPos:: Route104_EventScript_Rival:: lockall setvar VAR_0x8008, 1 - applymovement LOCALID_RIVAL, Common_Movement_FacePlayer + applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_RivalEncounter @@ -57,19 +53,19 @@ Route104_EventScript_RivalTrigger:: applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 10 - addobject LOCALID_RIVAL + addobject LOCALID_ROUTE104_RIVAL clearflag FLAG_HIDE_ROUTE_104_RIVAL applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBackUp waitmovement 0 - applymovement LOCALID_RIVAL, Route104_Movement_RivalExitBrineysCottage + applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalExitBrineysCottage waitmovement 0 delay 20 setvar VAR_0x8008, 0 call RustboroCity_EventScript_PlayRivalMusic playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_RivalEncounter @@ -108,13 +104,13 @@ Route104_EventScript_MayEncounter:: delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival - applymovement LOCALID_RIVAL, Route104_Movement_RivalWalkSlowLeft + applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalWalkSlowLeft msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT closemessage waitmovement 0 - applymovement LOCALID_RIVAL, Route104_Movement_RivalApproachPlayer + applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer waitmovement 0 - copyobjectxytoperm LOCALID_RIVAL + copyobjectxytoperm LOCALID_ROUTE104_RIVAL msgbox Route104_Text_MayMinesDecentLetsBattle, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, Route104_EventScript_BattleMay msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT @@ -194,13 +190,13 @@ Route104_EventScript_BrendanEncounter:: delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival - applymovement LOCALID_RIVAL, Route104_Movement_RivalWalkSlowLeft + applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalWalkSlowLeft msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT closemessage waitmovement 0 - applymovement LOCALID_RIVAL, Route104_Movement_RivalApproachPlayer + applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer waitmovement 0 - copyobjectxytoperm LOCALID_RIVAL + copyobjectxytoperm LOCALID_ROUTE104_RIVAL msgbox Route104_Text_BrendanDoingGreatLetsBattle, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, Route104_EventScript_BattleBrendan msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT @@ -347,11 +343,11 @@ Route104_EventScript_Girl2:: end Route104_EventScript_SailToDewford:: - setobjectsubpriority LOCALID_BRINEY_R104, MAP_ROUTE104, 0 + setobjectsubpriority LOCALID_ROUTE104_BRINEY, MAP_ROUTE104, 0 setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0 - applymovement LOCALID_BRINEY_R104, Route104_Movement_BrineyBoardBoat + applymovement LOCALID_ROUTE104_BRINEY, Route104_Movement_BrineyBoardBoat waitmovement 0 - removeobject LOCALID_BRINEY_R104 + removeobject LOCALID_ROUTE104_BRINEY applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBoardBoat waitmovement 0 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 @@ -361,13 +357,13 @@ Route104_EventScript_SailToDewford:: end Route104_EventScript_SailToDewfordNoCall:: - applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewford + applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewford applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford waitmovement 0 goto Route104_EventScript_ArriveInDewford Route104_EventScript_SailToDewfordDadCalls:: - applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewfordBeforeDadCalls + applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewfordBeforeDadCalls applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls waitmovement 0 pokenavcall Route104_Text_DadPokenavCall @@ -380,8 +376,8 @@ Route104_EventScript_SailToDewfordDadCalls:: delay 30 setflag FLAG_ENABLE_NORMAN_MATCH_CALL applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls - applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104 - waitmovement LOCALID_BOAT_R104, MAP_ROUTE104 + applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104 + waitmovement LOCALID_ROUTE104_BOAT, MAP_ROUTE104 waitmovement 0 goto Route104_EventScript_ArriveInDewford @@ -393,21 +389,21 @@ Route104_EventScript_ArriveInDewford:: showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerMoveForBriney waitmovement 0 - setobjectxyperm LOCALID_BRINEY_DEWFORD, 12, 8 - addobject LOCALID_BRINEY_DEWFORD - setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0 + setobjectxyperm LOCALID_DEWFORD_BRINEY, 12, 8 + addobject LOCALID_DEWFORD_BRINEY + setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - applymovement LOCALID_BRINEY_DEWFORD, Route104_Movement_BrineyExitBoat + applymovement LOCALID_DEWFORD_BRINEY, Route104_Movement_BrineyExitBoat waitmovement 0 - addobject LOCALID_BOAT_DEWFORD + addobject LOCALID_DEWFORD_BOAT clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN call Common_EventScript_StopBrineysBoatMusic setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - hideobjectat LOCALID_BOAT_R104, MAP_ROUTE104 + hideobjectat LOCALID_ROUTE104_BOAT, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 - resetobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN - copyobjectxytoperm LOCALID_BRINEY_DEWFORD + resetobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN + copyobjectxytoperm LOCALID_DEWFORD_BRINEY setvar VAR_BOARD_BRINEY_BOAT_STATE, 0 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_DeliverLetterReminder goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 6424965291a7..91420bd74681 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BRINEYS_HOUSE_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 3, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" }, { + "local_id": "LOCALID_BRINEYS_HOUSE_PEEKO", "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 3, diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 4c693cb4faaf..bce0895919c8 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BRINEY, 1 -.set LOCALID_PEEKO, 2 - Route104_MrBrineysHouse_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_OnTransition .byte 0 @@ -16,10 +13,10 @@ Route104_MrBrineysHouse_EventScript_HideRustboroRival:: return Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: - setobjectxyperm LOCALID_BRINEY, 9, 3 - setobjectmovementtype LOCALID_BRINEY, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - setobjectxyperm LOCALID_PEEKO, 9, 6 - setobjectmovementtype LOCALID_PEEKO, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + setobjectxyperm LOCALID_BRINEYS_HOUSE_BRINEY, 9, 3 + setobjectmovementtype LOCALID_BRINEYS_HOUSE_BRINEY, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + setobjectxyperm LOCALID_BRINEYS_HOUSE_PEEKO, 9, 6 + setobjectmovementtype LOCALID_BRINEYS_HOUSE_PEEKO, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN return Route104_MrBrineysHouse_EventScript_Briney:: diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 27e18ddc71ff..9f81453c601c 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FLOWER_SHOP_OWNER", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 0, "y": 3, diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 5f0ec28fa51d..08d52a0a731b 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_OWNER, 1 - Route104_PrettyPetalFlowerShop_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_OnTransition .byte 0 @@ -12,7 +10,7 @@ Route104_PrettyPetalFlowerShop_OnTransition: end Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner:: - setobjectxyperm LOCALID_OWNER, 4, 6 + setobjectxyperm LOCALID_FLOWER_SHOP_OWNER, 4, 6 end Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 49357f0a0e9d..be5fa5a6b20b 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -26,6 +26,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE109_BOAT", "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 21, "y": 26, @@ -39,6 +40,7 @@ "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" }, { + "local_id": "LOCALID_ROUTE109_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 21, "y": 24, diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index f0353fef4d61..a7b4f65d48b2 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -6,11 +6,11 @@ Route109_MapScripts:: Route109_EventScript_StartDepartForDewford:: call EventScript_BackupMrBrineyLocation - setobjectsubpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0 + setobjectsubpriority LOCALID_ROUTE109_BRINEY, MAP_ROUTE109, 0 setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0 - applymovement LOCALID_BRINEY_R109, Route109_Movement_BrineyEnterBoat + applymovement LOCALID_ROUTE109_BRINEY, Route109_Movement_BrineyEnterBoat waitmovement 0 - removeobject LOCALID_BRINEY_R109 + removeobject LOCALID_ROUTE109_BRINEY switch VAR_FACING case DIR_SOUTH, Route109_EventScript_EnterBoatSouth case DIR_WEST, Route109_EventScript_EnterBoatWest @@ -38,7 +38,7 @@ Route109_EventScript_EnterBoatWest:: Route109_EventScript_DoSailToDewford:: hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 call Common_EventScript_PlayBrineysBoatMusic - applymovement LOCALID_BOAT_R109, Route109_Movement_SailToDewford + applymovement LOCALID_ROUTE109_BOAT, Route109_Movement_SailToDewford applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_SailToDewford waitmovement 0 delay 50 @@ -46,22 +46,22 @@ Route109_EventScript_DoSailToDewford:: showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerExitBoat waitmovement 0 - addobject LOCALID_BOAT_DEWFORD + addobject LOCALID_DEWFORD_BOAT clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setobjectxyperm LOCALID_BRINEY_DEWFORD, 12, 8 - addobject LOCALID_BRINEY_DEWFORD - setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0 - applymovement LOCALID_BRINEY_DEWFORD, Route109_Movement_BrineyExitBoat + setobjectxyperm LOCALID_DEWFORD_BRINEY, 12, 8 + addobject LOCALID_DEWFORD_BRINEY + setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 + applymovement LOCALID_DEWFORD_BRINEY, Route109_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT - hideobjectat LOCALID_BOAT_R109, MAP_ROUTE109 + hideobjectat LOCALID_ROUTE109_BOAT, MAP_ROUTE109 msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 - resetobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN - copyobjectxytoperm LOCALID_BRINEY_DEWFORD + resetobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN + copyobjectxytoperm LOCALID_DEWFORD_BRINEY release end diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 6e4982fa22c1..989229f8c993 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -291,6 +291,7 @@ "flag": "FLAG_ITEM_ROUTE_110_RARE_CANDY" }, { + "local_id": "LOCALID_CHALLENGE_BIKER", "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 27, "y": 92, @@ -382,6 +383,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE110_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 34, "y": 54, @@ -395,6 +397,7 @@ "flag": "FLAG_HIDE_ROUTE_110_RIVAL" }, { + "local_id": "LOCALID_ROUTE110_RIVAL_ON_BIKE", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 34, "y": 54, @@ -486,6 +489,7 @@ "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" }, { + "local_id": "LOCALID_ROUTE110_BIRCH", "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 79, diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7d16c8b10c28..984595a82c98 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,8 +1,3 @@ -.set LOCALID_CHALLENGE_BIKER, 21 -.set LOCALID_RIVAL, 28 -.set LOCALID_RIVAL_ON_BIKE, 29 -.set LOCALID_BIRCH, 36 - Route110_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, Route110_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_OnTransition @@ -378,11 +373,11 @@ Route110_EventScript_RivalScene:: checkplayergender call_if_eq VAR_RESULT, MALE, Route110_EventScript_PlayMayMusic call_if_eq VAR_RESULT, FEMALE, Route110_EventScript_PlayBrendanMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ROUTE110_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_ROUTE110_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_ROUTE110_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 30 call_if_eq VAR_0x8008, 1, Route110_EventScript_RivalApproachPlayer1 @@ -471,15 +466,15 @@ Route110_EventScript_RivalExit:: call_if_eq VAR_0x8008, 1, Route110_EventScript_MoveRival1 call_if_eq VAR_0x8008, 2, Route110_EventScript_MoveRival2 call_if_eq VAR_0x8008, 3, Route110_EventScript_MoveRival3 - setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_FACE_RIGHT - setobjectmovementtype LOCALID_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_RIGHT - removeobject LOCALID_RIVAL - addobject LOCALID_RIVAL_ON_BIKE + setobjectmovementtype LOCALID_ROUTE110_RIVAL, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype LOCALID_ROUTE110_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_RIGHT + removeobject LOCALID_ROUTE110_RIVAL + addobject LOCALID_ROUTE110_RIVAL_ON_BIKE delay 45 call_if_eq VAR_0x8008, 1, Route110_EventScript_RivalExit1 call_if_eq VAR_0x8008, 2, Route110_EventScript_RivalExit2 call_if_eq VAR_0x8008, 3, Route110_EventScript_RivalExit3 - removeobject LOCALID_RIVAL_ON_BIKE + removeobject LOCALID_ROUTE110_RIVAL_ON_BIKE setvar VAR_ROUTE110_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm @@ -487,45 +482,45 @@ Route110_EventScript_RivalExit:: end Route110_EventScript_RivalApproachPlayer1:: - applymovement LOCALID_RIVAL, Route110_Movement_RivalApproachPlayer1 + applymovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer1 waitmovement 0 return Route110_EventScript_RivalApproachPlayer2:: - applymovement LOCALID_RIVAL, Route110_Movement_RivalApproachPlayer2 + applymovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer2 waitmovement 0 return Route110_EventScript_RivalApproachPlayer3:: - applymovement LOCALID_RIVAL, Route110_Movement_RivalApproachPlayer3 + applymovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer3 waitmovement 0 return Route110_EventScript_RivalExit1:: - applymovement LOCALID_RIVAL_ON_BIKE, Route110_Movement_RivalExit1 + applymovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit1 waitmovement 0 return Route110_EventScript_RivalExit2:: - applymovement LOCALID_RIVAL_ON_BIKE, Route110_Movement_RivalExit2 + applymovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit2 waitmovement 0 return Route110_EventScript_RivalExit3:: - applymovement LOCALID_RIVAL_ON_BIKE, Route110_Movement_RivalExit3 + applymovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit3 waitmovement 0 return Route110_EventScript_MoveRival1:: - setobjectxyperm LOCALID_RIVAL_ON_BIKE, 33, 55 + setobjectxyperm LOCALID_ROUTE110_RIVAL_ON_BIKE, 33, 55 return Route110_EventScript_MoveRival2:: - setobjectxyperm LOCALID_RIVAL_ON_BIKE, 34, 55 + setobjectxyperm LOCALID_ROUTE110_RIVAL_ON_BIKE, 34, 55 return Route110_EventScript_MoveRival3:: - setobjectxyperm LOCALID_RIVAL_ON_BIKE, 35, 55 + setobjectxyperm LOCALID_ROUTE110_RIVAL_ON_BIKE, 35, 55 return Route110_Movement_RivalApproachPlayer1: @@ -596,13 +591,13 @@ Route110_EventScript_BirchScene4:: goto Route110_EventScript_BirchScene Route110_EventScript_BirchScene:: - addobject LOCALID_BIRCH - applymovement LOCALID_BIRCH, Route110_Movement_BirchEntrance + addobject LOCALID_ROUTE110_BIRCH + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchEntrance waitmovement 0 playse SE_PIN - applymovement LOCALID_BIRCH, Common_Movement_ExclamationMark + applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_BIRCH, Common_Movement_Delay48 + applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_Delay48 waitmovement 0 call_if_eq VAR_0x8008, 1, Route110_EventScript_BirchApproachPlayer1 call_if_eq VAR_0x8008, 2, Route110_EventScript_BirchApproachPlayer2 @@ -611,13 +606,13 @@ Route110_EventScript_BirchScene:: msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT closemessage delay 20 - applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 10 - applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 20 - applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 30 msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT @@ -635,48 +630,48 @@ Route110_EventScript_BirchScene:: call_if_eq VAR_0x8008, 2, Route110_EventScript_BirchExit2 call_if_eq VAR_0x8008, 3, Route110_EventScript_BirchExit3 call_if_eq VAR_0x8008, 4, Route110_EventScript_BirchExit4 - removeobject LOCALID_BIRCH + removeobject LOCALID_ROUTE110_BIRCH setvar VAR_REGISTER_BIRCH_STATE, 2 releaseall end Route110_EventScript_BirchApproachPlayer1:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer1 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer1 waitmovement 0 return Route110_EventScript_BirchApproachPlayer2:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer2 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer2 waitmovement 0 return Route110_EventScript_BirchApproachPlayer3:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer3 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer3 waitmovement 0 return Route110_EventScript_BirchApproachPlayer4:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer4 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer4 waitmovement 0 return Route110_EventScript_BirchExit1:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchExit1 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit1 waitmovement 0 return Route110_EventScript_BirchExit2:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchExit2 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit2 waitmovement 0 return Route110_EventScript_BirchExit3:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchExit3 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit3 waitmovement 0 return Route110_EventScript_BirchExit4:: - applymovement LOCALID_BIRCH, Route110_Movement_BirchExit4 + applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit4 waitmovement 0 return diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 3775505235c5..e094688bbf64 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MECHADOLL_1", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 17, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MECHADOLL_2", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 0, "y": 7, @@ -41,6 +43,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MECHADOLL_3", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 14, "y": 10, @@ -54,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MECHADOLL_4", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 14, "y": 19, @@ -67,6 +71,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MECHADOLL_5", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 4, diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index e0fa432bd2ae..c59dad2e5719 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,9 +1,3 @@ -.set LOCALID_MECHADOLL_1, 1 -.set LOCALID_MECHADOLL_2, 2 -.set LOCALID_MECHADOLL_3, 3 -.set LOCALID_MECHADOLL_4, 4 -.set LOCALID_MECHADOLL_5, 5 - Route110_TrickHousePuzzle5_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_OnTransition .byte 0 diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 054e846c4ada..c090b61c9fe8 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -31,6 +31,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE111_VICTOR", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 13, "y": 114, @@ -44,6 +45,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, { + "local_id": "LOCALID_ROUTE111_VICTORIA", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 13, "y": 113, @@ -57,6 +59,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" }, { + "local_id": "LOCALID_ROUTE111_VIVI", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 113, @@ -70,6 +73,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" }, { + "local_id": "LOCALID_ROUTE111_VICKY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 13, "y": 113, @@ -623,6 +627,7 @@ "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" }, { + "local_id": "LOCALID_ROUTE111_ROCK_SMASH_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 101, diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 7335d0e1cea6..82800332285e 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,11 +1,3 @@ -.set LOCALID_VICTOR, 1 -.set LOCALID_VICTORIA, 2 -.set LOCALID_VIVI, 3 -.set LOCALID_VICKY, 4 -.set LOCALID_ROCK_SMASH_MAN, 46 - -@ Note: LOCALID_ROUTE111_PLAYER_FALLING is a local id for this map used elsewhere. It's defined in event_objects.h - Route111_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition @@ -277,68 +269,68 @@ Route111_EventScript_Victor:: Route111_EventScript_BattleWinstrates:: msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat - applymovement LOCALID_VICTOR, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ROUTE111_VICTOR, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call Route111_EventScript_OpenWinstrateDoor msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_VICTOR, Route111_Movement_WinstrateEnterHouse + applymovement LOCALID_ROUTE111_VICTOR, Route111_Movement_WinstrateEnterHouse waitmovement 0 - removeobject LOCALID_VICTOR + removeobject LOCALID_ROUTE111_VICTOR call Route111_EventScript_CloseWinstrateDoor applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor - addobject LOCALID_VICTORIA - applymovement LOCALID_VICTORIA, Route111_Movement_WinstrateExitHouse + addobject LOCALID_ROUTE111_VICTORIA + applymovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateExitHouse waitmovement 0 call Route111_EventScript_CloseWinstrateDoor msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat - applymovement LOCALID_VICTORIA, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ROUTE111_VICTORIA, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call Route111_EventScript_OpenWinstrateDoor msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_VICTORIA, Route111_Movement_WinstrateEnterHouse + applymovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateEnterHouse waitmovement 0 - removeobject LOCALID_VICTORIA + removeobject LOCALID_ROUTE111_VICTORIA call Route111_EventScript_CloseWinstrateDoor applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor - addobject LOCALID_VIVI - applymovement LOCALID_VIVI, Route111_Movement_WinstrateExitHouse + addobject LOCALID_ROUTE111_VIVI + applymovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateExitHouse waitmovement 0 call Route111_EventScript_CloseWinstrateDoor msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat - applymovement LOCALID_VIVI, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ROUTE111_VIVI, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call Route111_EventScript_OpenWinstrateDoor msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_VIVI, Route111_Movement_WinstrateEnterHouse + applymovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateEnterHouse waitmovement 0 - removeobject LOCALID_VIVI + removeobject LOCALID_ROUTE111_VIVI call Route111_EventScript_CloseWinstrateDoor applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor - addobject LOCALID_VICKY - applymovement LOCALID_VICKY, Route111_Movement_WinstrateExitHouse + addobject LOCALID_ROUTE111_VICKY + applymovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateExitHouse waitmovement 0 call Route111_EventScript_CloseWinstrateDoor msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_VICKY, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ROUTE111_VICKY, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call Route111_EventScript_OpenWinstrateDoor - applymovement LOCALID_VICKY, Route111_Movement_WinstrateEnterHouse + applymovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateEnterHouse waitmovement 0 - removeobject LOCALID_VICKY + removeobject LOCALID_ROUTE111_VICKY call Route111_EventScript_CloseWinstrateDoor release end @@ -427,11 +419,11 @@ Route111_EventScript_HikerMirageTowerVisible:: Route111_EventScript_RockSmashTipFatMan:: lockall - applymovement LOCALID_ROCK_SMASH_MAN, Common_Movement_FacePlayer + applymovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FacePlayer waitmovement 0 msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROCK_SMASH_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 5e6f9d75e89e..3e061ae94ec5 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_WINSTRATE_HOUSE_VIVI", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_WINSTRATE_HOUSE_VICTOR", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, @@ -41,6 +43,7 @@ "flag": "0" }, { + "local_id": "LOCALID_WINSTRATE_HOUSE_VICTORIA", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 4, @@ -54,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_WINSTRATE_HOUSE_VICKY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 4, "y": 4, diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index a163c7b4f2d7..4f44241cf98b 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -1,15 +1,10 @@ -.set LOCALID_VIVI, 1 -.set LOCALID_VICTOR, 2 -.set LOCALID_VICTORIA, 3 -.set LOCALID_VICKY, 4 - Route111_WinstrateFamilysHouse_MapScripts:: .byte 0 Route111_WinstrateFamilysHouse_EventScript_Victor:: lock faceplayer - setvar VAR_0x8008, LOCALID_VICTOR + setvar VAR_0x8008, LOCALID_WINSTRATE_HOUSE_VICTOR msgbox Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end @@ -17,7 +12,7 @@ Route111_WinstrateFamilysHouse_EventScript_Victor:: Route111_WinstrateFamilysHouse_EventScript_Victoria:: lock faceplayer - setvar VAR_0x8008, LOCALID_VICTORIA + setvar VAR_0x8008, LOCALID_WINSTRATE_HOUSE_VICTORIA goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT giveitem ITEM_MACHO_BRACE @@ -34,7 +29,7 @@ Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace:: Route111_WinstrateFamilysHouse_EventScript_Vivi:: lock faceplayer - setvar VAR_0x8008, LOCALID_VIVI + setvar VAR_0x8008, LOCALID_WINSTRATE_HOUSE_VIVI msgbox Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end @@ -42,7 +37,7 @@ Route111_WinstrateFamilysHouse_EventScript_Vivi:: Route111_WinstrateFamilysHouse_EventScript_Vicky:: lock faceplayer - setvar VAR_0x8008, LOCALID_VICKY + setvar VAR_0x8008, LOCALID_WINSTRATE_HOUSE_VICKY goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrong, MSGBOX_DEFAULT setflag FLAG_TEMP_4 diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 5340680ea5c3..d3260f27fef0 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -31,6 +31,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE112_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 26, "y": 30, @@ -96,6 +97,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE112_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 27, "y": 30, diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index a6c248e1f6dd..73e229532f40 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_GRUNT_1, 1 -.set LOCALID_GRUNT_2, 6 - Route112_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route112_OnTransition .byte 0 @@ -13,36 +10,36 @@ Route112_OnTransition: Route112_EventScript_MagmaGrunts:: lockall delay 40 - applymovement LOCALID_GRUNT_1, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 20 msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 20 msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement LOCALID_GRUNT_1, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 20 msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 20 msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 09401d83b0e3..3aeadc6f1f59 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ROUTE112_CABLE_CAR_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 3ce4f62e2a4a..416b3b5627bd 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_ATTENDANT, 1 - Route112_CableCarStation_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_OnFrame @@ -11,8 +9,8 @@ Route112_CableCarStation_OnTransition: end Route112_CableCarStation_EventScript_MoveAttendantAside:: - setobjectxyperm LOCALID_ATTENDANT, 7, 4 - setobjectmovementtype LOCALID_ATTENDANT, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_ROUTE112_CABLE_CAR_ATTENDANT, 7, 4 + setobjectmovementtype LOCALID_ROUTE112_CABLE_CAR_ATTENDANT, MOVEMENT_TYPE_FACE_LEFT return Route112_CableCarStation_OnFrame: @@ -22,11 +20,11 @@ Route112_CableCarStation_OnFrame: Route112_CableCarStation_EventScript_ExitCableCar:: lockall applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar - applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar + applymovement LOCALID_ROUTE112_CABLE_CAR_ATTENDANT, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 - setobjectxyperm LOCALID_ATTENDANT, 6, 7 - setobjectmovementtype LOCALID_ATTENDANT, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_ROUTE112_CABLE_CAR_ATTENDANT, 6, 7 + setobjectmovementtype LOCALID_ROUTE112_CABLE_CAR_ATTENDANT, MOVEMENT_TYPE_FACE_DOWN releaseall end @@ -41,7 +39,7 @@ Route112_CableCarStation_EventScript_Attendant:: Route112_CableCarStation_EventScript_RideCableCar:: msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_LeadPlayerToCableCar + applymovement LOCALID_ROUTE112_CABLE_CAR_ATTENDANT, Route112_CableCarStation_Movement_LeadPlayerToCableCar applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, FALSE @ Going up diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 034545e6ba57..625c5afc0856 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FOSSIL_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 3, diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 72138bbe4006..9ec5247a9f88 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_FOSSIL_MANIAC, 1 - Route114_FossilManiacsTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index adf9a86d59ee..6e4da0ac0a0a 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -156,6 +156,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE116_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 46, "y": 9, @@ -286,6 +287,7 @@ "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" }, { + "local_id": "LOCALID_ROUTE116_WANDAS_BF", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 38, "y": 9, diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 2a464d199655..98206435ee4d 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BRINEY, 11 -.set LOCALID_WANDAS_BF_OUTSIDE, 21 - Route116_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad @@ -15,7 +12,7 @@ Route116_OnTransition: end Route116_EventScript_SetWandasBoyfriendPos:: - setobjectxyperm LOCALID_WANDAS_BF_OUTSIDE, 38, 10 + setobjectxyperm LOCALID_ROUTE116_WANDAS_BF, 38, 10 return Route116_OnLoad: @@ -144,7 +141,7 @@ Route116_EventScript_Briney:: Route116_EventScript_BrineyTrigger:: lockall - applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ROUTE116_BRINEY, Common_Movement_WalkInPlaceFasterRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index e1e2b288d636..f1a292c00d47 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -271,6 +271,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE118_STEVEN", "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 44, "y": 7, diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 92dd8847d46a..db1c001fdfdb 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_STEVEN, 19 - Route118_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad @@ -66,7 +64,7 @@ Route118_EventScript_StevenTrigger0:: setvar VAR_0x8008, 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement LOCALID_STEVEN, Route118_Movement_StevenApproachLedge0 + applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenApproachLedge0 waitmovement 0 goto Route118_EventScript_StevenTrigger end @@ -84,14 +82,14 @@ Route118_EventScript_StevenTrigger2:: setvar VAR_0x8008, 2 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement LOCALID_STEVEN, Route118_Movement_StevenApproachLedge2 + applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenApproachLedge2 waitmovement 0 goto Route118_EventScript_StevenTrigger end Route118_EventScript_StevenTrigger:: playse SE_LEDGE - applymovement LOCALID_STEVEN, Route118_Movement_StevenJumpLedge + applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenJumpLedge waitmovement 0 delay 30 msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT @@ -100,25 +98,25 @@ Route118_EventScript_StevenTrigger:: call_if_eq VAR_0x8008, 1, Route118_EventScript_StevenExit1 call_if_eq VAR_0x8008, 2, Route118_EventScript_StevenExit2 setvar VAR_ROUTE118_STATE, 1 - removeobject LOCALID_STEVEN + removeobject LOCALID_ROUTE118_STEVEN releaseall end Route118_EventScript_StevenExit0:: applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit - applymovement LOCALID_STEVEN, Route118_Movement_StevenExit0 + applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenExit0 waitmovement 0 return Route118_EventScript_StevenExit1:: applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit - applymovement LOCALID_STEVEN, Route118_Movement_StevenExit1 + applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenExit1 waitmovement 0 return Route118_EventScript_StevenExit2:: applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit - applymovement LOCALID_STEVEN, Route118_Movement_StevenExit2 + applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenExit2 waitmovement 0 return diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index f8591a5ba2f1..a2850b70ab14 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -221,6 +221,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE119_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 25, "y": 32, @@ -338,6 +339,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { + "local_id": "LOCALID_ROUTE119_RIVAL_ON_BIKE", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 17, "y": 33, @@ -572,6 +574,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" }, { + "local_id": "LOCALID_ROUTE119_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 28, "y": 25, diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 6c9767dcb625..6dd4eb8caae4 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_RIVAL, 16 -.set LOCALID_RIVAL_ON_BIKE, 25 -.set LOCALID_SCOTT, 43 - Route119_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition @@ -42,7 +38,7 @@ Route119_EventScript_RivalTrigger2:: Route119_EventScript_RivalEncounter:: lockall - addobject LOCALID_RIVAL_ON_BIKE + addobject LOCALID_ROUTE119_RIVAL_ON_BIKE checkplayergender call_if_eq VAR_RESULT, MALE, Route119_EventScript_PlayMayMusic call_if_eq VAR_RESULT, FEMALE, Route119_EventScript_PlayBrendanMusic @@ -54,8 +50,8 @@ Route119_EventScript_RivalEncounter:: delay 30 call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2 - removeobject LOCALID_RIVAL_ON_BIKE - addobject LOCALID_RIVAL + removeobject LOCALID_ROUTE119_RIVAL_ON_BIKE + addobject LOCALID_ROUTE119_RIVAL delay 30 checkplayergender goto_if_eq VAR_RESULT, MALE, Route119_EventScript_BattleMay @@ -140,78 +136,78 @@ Route119_EventScript_RivalExitScottArrive:: closemessage call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2 - removeobject LOCALID_RIVAL - addobject LOCALID_RIVAL_ON_BIKE + removeobject LOCALID_ROUTE119_RIVAL + addobject LOCALID_ROUTE119_RIVAL_ON_BIKE delay 30 call_if_eq VAR_TEMP_1, 1, Route119_EventScript_RivalExit1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_RivalExit2 - removeobject LOCALID_RIVAL_ON_BIKE + removeobject LOCALID_ROUTE119_RIVAL_ON_BIKE setvar VAR_ROUTE119_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetScottPos1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetScottPos2 - addobject LOCALID_SCOTT - applymovement LOCALID_SCOTT, Route119_Movement_ScottEnter + addobject LOCALID_ROUTE119_SCOTT + applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottEnter waitmovement 0 addvar VAR_SCOTT_STATE, 1 msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT closemessage call_if_eq VAR_TEMP_1, 1, Route119_EventScript_ScottExit1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_ScottExit2 - removeobject LOCALID_SCOTT + removeobject LOCALID_ROUTE119_SCOTT releaseall end Route119_EventScript_SetScottPos1:: - setobjectxyperm LOCALID_SCOTT, 27, 25 + setobjectxyperm LOCALID_ROUTE119_SCOTT, 27, 25 return Route119_EventScript_SetScottPos2:: - setobjectxyperm LOCALID_SCOTT, 28, 25 + setobjectxyperm LOCALID_ROUTE119_SCOTT, 28, 25 return Route119_EventScript_ScottExit1:: - applymovement LOCALID_SCOTT, Route119_Movement_ScottExit1 + applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit1 waitmovement 0 return Route119_EventScript_ScottExit2:: - applymovement LOCALID_SCOTT, Route119_Movement_ScottExit2 + applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit2 waitmovement 0 return Route119_EventScript_RivalEnter1:: - applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1 + applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1 waitmovement 0 return Route119_EventScript_RivalEnter2:: - applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2 + applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2 waitmovement 0 return Route119_EventScript_RivalExit1:: applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1 - applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit1 + applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalExit1 waitmovement 0 return Route119_EventScript_RivalExit2:: applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2 - applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit2 + applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalExit2 waitmovement 0 return Route119_EventScript_SetRivalPos1:: - setobjectxyperm LOCALID_RIVAL, 25, 32 - setobjectxyperm LOCALID_RIVAL_ON_BIKE, 25, 32 + setobjectxyperm LOCALID_ROUTE119_RIVAL, 25, 32 + setobjectxyperm LOCALID_ROUTE119_RIVAL_ON_BIKE, 25, 32 return Route119_EventScript_SetRivalPos2:: - setobjectxyperm LOCALID_RIVAL, 26, 32 - setobjectxyperm LOCALID_RIVAL_ON_BIKE, 26, 32 + setobjectxyperm LOCALID_ROUTE119_RIVAL, 26, 32 + setobjectxyperm LOCALID_ROUTE119_RIVAL_ON_BIKE, 26, 32 return Route119_Movement_PlayerWatchRivalExit1: diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 02f2ffe37fd5..a0d5e12ff343 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -67,6 +67,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { + "local_id": "LOCALID_WEATHER_INSTITUTE_LITTLE_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 14, "y": 11, diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index cce41bfb5ff3..927984aebe2b 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LITTLE_BOY, 5 - Route119_WeatherInstitute_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_OnTransition .byte 0 @@ -9,8 +7,8 @@ Route119_WeatherInstitute_1F_OnTransition: end Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos:: - setobjectxyperm LOCALID_LITTLE_BOY, 0, 5 - setobjectmovementtype LOCALID_LITTLE_BOY, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_WEATHER_INSTITUTE_LITTLE_BOY, 0, 5 + setobjectmovementtype LOCALID_WEATHER_INSTITUTE_LITTLE_BOY, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_1F_EventScript_LittleBoy:: diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 935ea48dd959..8b62e63a91eb 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 15, "y": 6, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { + "local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 8, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { + "local_id": "LOCALID_WEATHER_INSTITUTE_2F_SHELLY", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 4, "y": 6, @@ -67,6 +70,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { + "local_id": "LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, @@ -93,6 +97,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { + "local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 16, "y": 6, @@ -106,6 +111,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" }, { + "local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_4", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 19, "y": 6, diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e5df03d4a1ab..b651fa626fac 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,10 +1,3 @@ -.set LOCALID_GRUNT_1, 1 -.set LOCALID_GRUNT_2, 2 -.set LOCALID_SHELLY, 3 -.set LOCALID_SCIENTIST, 5 -.set LOCALID_GRUNT_3, 7 -.set LOCALID_GRUNT_4, 8 - Route119_WeatherInstitute_2F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_OnTransition .byte 0 @@ -16,18 +9,18 @@ Route119_WeatherInstitute_2F_OnTransition: end Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere:: - setobjectxyperm LOCALID_SCIENTIST, 1, 6 - setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, 1, 6 + setobjectmovementtype LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone:: - setobjectxyperm LOCALID_SCIENTIST, 4, 6 - setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, 4, 6 + setobjectmovementtype LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: - setobjectxyperm LOCALID_SCIENTIST, 2, 2 - setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, 2, 2 + setobjectmovementtype LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, MOVEMENT_TYPE_FACE_UP return Route119_WeatherInstitute_2F_EventScript_Grunt5:: @@ -53,16 +46,16 @@ Route119_WeatherInstitute_2F_EventScript_Shelly:: Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_DEFAULT closemessage - addobject LOCALID_GRUNT_3 - applymovement LOCALID_GRUNT_3, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly + addobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3 + applymovement LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement LOCALID_SHELLY, Common_Movement_ExclamationMark + applymovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_SHELLY, Common_Movement_Delay48 + applymovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_Delay48 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre, MSGBOX_DEFAULT closemessage @@ -72,17 +65,17 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: fadescreen FADE_TO_BLACK setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M - removeobject LOCALID_GRUNT_1 - removeobject LOCALID_GRUNT_2 - removeobject LOCALID_SHELLY - removeobject LOCALID_GRUNT_4 - removeobject LOCALID_GRUNT_3 + removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_1 + removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_2 + removeobject LOCALID_WEATHER_INSTITUTE_2F_SHELLY + removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_4 + removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3 applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 fadescreen FADE_FROM_BLACK - applymovement LOCALID_SCIENTIST, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer + applymovement LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer waitmovement 0 - copyobjectxytoperm LOCALID_SCIENTIST + copyobjectxytoperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform end diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index f8799a74ef37..0a12521c676c 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -407,6 +407,7 @@ "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" }, { + "local_id": "LOCALID_BRIDGE_KECLEON", "graphics_id": "OBJ_EVENT_GFX_KECLEON", "x": 12, "y": 16, @@ -420,6 +421,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" }, { + "local_id": "LOCALID_ROUTE120_STEVEN", "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 13, "y": 15, @@ -485,6 +487,7 @@ "flag": "0" }, { + "local_id": "LOCALID_BRIDGE_KECLEON_SHADOW", "graphics_id": "OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW", "x": 12, "y": 16, diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a0bfbc60c38f..defff8807a03 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,7 +1,4 @@ -.set LOCALID_BRIDGE_KECLEON, 30 -.set LOCALID_STEVEN, 31 -.set LOCALID_BRIDGE_KECLEON_SHADOW, 36 @ They use a second object which is identical to Kecleon but has a reflection palette tag for the bridge shadow - +@ LOCALID_BRIDGE_KECLEON_SHADOW is a second object which is identical to LOCALID_BRIDGE_KECLEON but has a reflection palette tag for the bridge shadow Route120_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition @@ -180,7 +177,7 @@ Route120_EventScript_StevenBattleKecleon:: closemessage call_if_eq VAR_FACING, DIR_NORTH, Route120_EventScript_PlayerApproachKecleonNorth call_if_eq VAR_FACING, DIR_WEST, Route120_EventScript_PlayerApproachKecleonWest - applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 20 msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT @@ -214,7 +211,7 @@ Route120_EventScript_RemoveBridgeKecleonPostBattle:: end Route120_EventScript_StevenGiveDeconScope:: - applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT @@ -222,13 +219,13 @@ Route120_EventScript_StevenGiveDeconScope:: setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT closemessage - applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 dofieldeffect FLDEFF_NPCFLY_OUT delay 15 - removeobject LOCALID_STEVEN + removeobject LOCALID_ROUTE120_STEVEN waitfieldeffect FLDEFF_NPCFLY_OUT setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, FALSE setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, FALSE diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 4a73f3fdd9d2..9911a619c598 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -174,6 +174,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE121_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 8, @@ -187,6 +188,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { + "local_id": "LOCALID_ROUTE121_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 7, @@ -200,6 +202,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { + "local_id": "LOCALID_ROUTE121_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 31, "y": 7, diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 317328825c2f..beb9e3a91dbb 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_GRUNT_1, 12 -.set LOCALID_GRUNT_2, 13 -.set LOCALID_GRUNT_3, 14 - Route121_MapScripts:: .byte 0 @@ -20,18 +16,18 @@ Route121_EventScript_SafariZoneSign:: Route121_EventScript_AquaGruntsMoveOut:: lockall playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight + applymovement LOCALID_ROUTE121_GRUNT_2, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_1, Route121_Movement_Grunt1Exit - applymovement LOCALID_GRUNT_2, Route121_Movement_Grunt2Exit - applymovement LOCALID_GRUNT_3, Route121_Movement_Grunt3Exit + applymovement LOCALID_ROUTE121_GRUNT_1, Route121_Movement_Grunt1Exit + applymovement LOCALID_ROUTE121_GRUNT_2, Route121_Movement_Grunt2Exit + applymovement LOCALID_ROUTE121_GRUNT_3, Route121_Movement_Grunt3Exit waitmovement 0 fadedefaultbgm - removeobject LOCALID_GRUNT_1 - removeobject LOCALID_GRUNT_2 - removeobject LOCALID_GRUNT_3 + removeobject LOCALID_ROUTE121_GRUNT_1 + removeobject LOCALID_ROUTE121_GRUNT_2 + removeobject LOCALID_ROUTE121_GRUNT_3 setvar VAR_ROUTE121_STATE, 1 releaseall end diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 2d42b308501a..49f8a7d601c7 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -109,6 +109,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RUSTBORO_LITTLE_BOY", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 24, "y": 51, @@ -122,6 +123,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RUSTBORO_LITTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 25, "y": 51, @@ -135,6 +137,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RUSTBORO_DEVON_EMPLOYEE", "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 30, "y": 10, @@ -148,6 +151,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, { + "local_id": "LOCALID_RUSTBORO_GRUNT", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 21, @@ -200,6 +204,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RUSTBORO_RIVAL", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 16, "y": 50, @@ -213,6 +218,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL" }, { + "local_id": "LOCALID_RUSTBORO_SCIENTIST", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 11, "y": 15, diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 28fd38921019..8022083ea530 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,10 +1,3 @@ -.set LOCALID_LITTLE_BOY, 7 -.set LOCALID_LITTLE_GIRL, 8 -.set LOCALID_DEVON_EMPLOYEE, 9 -.set LOCALID_GRUNT, 10 -.set LOCALID_RIVAL, 14 -.set LOCALID_SCIENTIST, 15 - RustboroCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame @@ -20,11 +13,11 @@ RustboroCity_OnTransition: RustboroCity_EventScript_PositionScientistForExit:: goto_if_eq VAR_TEMP_0, 11, RustboroCity_EventScript_PositionScientistLeftExit - setobjectxyperm LOCALID_SCIENTIST, 12, 15 + setobjectxyperm LOCALID_RUSTBORO_SCIENTIST, 12, 15 end RustboroCity_EventScript_PositionScientistLeftExit:: - setobjectxyperm LOCALID_SCIENTIST, 11, 15 + setobjectxyperm LOCALID_RUSTBORO_SCIENTIST, 11, 15 end RustboroCity_EventScript_HideMapNamePopup:: @@ -42,22 +35,22 @@ RustboroCity_EventScript_ScientistAddMatchCall:: waitmovement 0 playse SE_EXIT delay 10 - addobject LOCALID_SCIENTIST - applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer + addobject LOCALID_RUSTBORO_SCIENTIST + applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer waitmovement 0 playse SE_PIN - applymovement LOCALID_SCIENTIST, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_SCIENTIST, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 - applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistWalkInPlaceDown + applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistWalkInPlaceDown waitmovement 0 msgbox RustboroCity_Text_DevelopedNewPokenavFeature, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 playse SE_CLICK delay 10 @@ -67,7 +60,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: delay 10 playse SE_CLICK delay 20 - applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox RustboroCity_Text_AddedMatchCallPleaseCallMrStone, MSGBOX_DEFAULT closemessage @@ -98,10 +91,10 @@ RustboroCity_EventScript_MatchCallTutorial:: delay 20 msgbox RustboroCity_Text_IdBetterGetBackToWork, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistLeave + applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistLeave waitmovement 0 playse SE_EXIT - removeobject LOCALID_SCIENTIST + removeobject LOCALID_RUSTBORO_SCIENTIST setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setvar VAR_RUSTBORO_CITY_STATE, 7 clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -227,7 +220,7 @@ RustboroCity_EventScript_LittleBoy:: lock faceplayer msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT - applymovement LOCALID_LITTLE_BOY, Common_Movement_FaceOriginalDirection + applymovement LOCALID_RUSTBORO_LITTLE_BOY, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -236,7 +229,7 @@ RustboroCity_EventScript_LittleGirl:: lock faceplayer msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT - applymovement LOCALID_LITTLE_GIRL, Common_Movement_FaceOriginalDirection + applymovement LOCALID_RUSTBORO_LITTLE_GIRL, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -250,40 +243,40 @@ RustboroCity_EventScript_Man2:: RustboroCity_EventScript_StolenGoodsTrigger0:: lockall - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21 - setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21 + setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 0 goto RustboroCity_EventScript_StolenGoodsScene end RustboroCity_EventScript_StolenGoodsTrigger1:: lockall - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21 - setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21 + setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 1 goto RustboroCity_EventScript_StolenGoodsScene end RustboroCity_EventScript_StolenGoodsTrigger2:: lockall - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21 - setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21 + setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 2 goto RustboroCity_EventScript_StolenGoodsScene end RustboroCity_EventScript_StolenGoodsTrigger3:: lockall - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21 - setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21 + setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 3 goto RustboroCity_EventScript_StolenGoodsScene end RustboroCity_EventScript_StolenGoodsTrigger4:: lockall - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21 - setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21 + setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 4 goto RustboroCity_EventScript_StolenGoodsScene end @@ -292,20 +285,20 @@ RustboroCity_EventScript_StolenGoodsScene:: msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_AQUA, FALSE - addobject LOCALID_GRUNT - addobject LOCALID_DEVON_EMPLOYEE - applymovement LOCALID_GRUNT, RustboroCity_Movement_GruntEscape + addobject LOCALID_RUSTBORO_GRUNT + addobject LOCALID_RUSTBORO_DEVON_EMPLOYEE + applymovement LOCALID_RUSTBORO_GRUNT, RustboroCity_Movement_GruntEscape waitmovement 0 - removeobject LOCALID_GRUNT - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt1 + removeobject LOCALID_RUSTBORO_GRUNT + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt1 waitmovement 0 msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt2 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt2 waitmovement 0 fadedefaultbgm - removeobject LOCALID_DEVON_EMPLOYEE - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 30, 10 + removeobject LOCALID_RUSTBORO_DEVON_EMPLOYEE + setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 30, 10 clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_DEVON_GOODS_STOLEN setvar VAR_RUSTBORO_CITY_STATE, 2 @@ -331,31 +324,31 @@ RustboroCity_EventScript_YouGotItThankYou:: @ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions RustboroCity_EventScript_EmployeeApproachUp:: - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp waitmovement 0 return @ Unused, see above RustboroCity_EventScript_EmployeeApproachLeft:: - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft waitmovement 0 return @ Unused, see above RustboroCity_EventScript_EmployeeApproachRight:: - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight waitmovement 0 return @ Unused, see above RustboroCity_EventScript_EmployeeApproachDown:: - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown waitmovement 0 return @ Unused, similar movement to the above scripts RustboroCity_EventScript_EmployeeApproachPlayerFar:: - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -509,57 +502,57 @@ RustboroCity_EventScript_EmployeeAskToGetGoods:: call_if_eq VAR_TEMP_1, 3, RustboroCity_EventScript_EmployeeApproachPlayerDown1 setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN setvar VAR_RUSTBORO_CITY_STATE, 3 - copyobjectxytoperm LOCALID_DEVON_EMPLOYEE + copyobjectxytoperm LOCALID_RUSTBORO_DEVON_EMPLOYEE msgbox RustboroCity_Text_HelpMeIWasRobbed, MSGBOX_DEFAULT releaseall end @ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods RustboroCity_EventScript_EmployeeFacePlayerUp1:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return RustboroCity_EventScript_EmployeeFacePlayerLeft1:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceRight waitmovement 0 return RustboroCity_EventScript_EmployeeFacePlayerDown1:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return RustboroCity_EventScript_EmployeeApproachPlayerDown1:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -618,69 +611,69 @@ RustboroCity_EventScript_BagFull:: return RustboroCity_EventScript_EmployeeFacePlayerUp2:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return RustboroCity_EventScript_EmployeeFacePlayerLeft2:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterRight waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceLeft waitmovement 0 return RustboroCity_EventScript_EmployeeFacePlayerDown2:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return RustboroCity_EventScript_EmployeeApproachPlayerDown2:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return RustboroCity_EventScript_EmployeeFacePlayerRight:: - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 playse SE_PIN - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 waitmovement 0 return RustboroCity_EventScript_Rival:: lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_FacePlayer + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_FacePlayer waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -701,14 +694,14 @@ RustboroCity_EventScript_PlayBrendanMusic:: RustboroCity_EventScript_RivalTrigger0:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer0 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer0 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -717,14 +710,14 @@ RustboroCity_EventScript_RivalTrigger0:: RustboroCity_EventScript_RivalTrigger1:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer1 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -733,14 +726,14 @@ RustboroCity_EventScript_RivalTrigger1:: RustboroCity_EventScript_RivalTrigger2:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer2 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer2 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -749,14 +742,14 @@ RustboroCity_EventScript_RivalTrigger2:: RustboroCity_EventScript_RivalTrigger3:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer3 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer3 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -765,14 +758,14 @@ RustboroCity_EventScript_RivalTrigger3:: RustboroCity_EventScript_RivalTrigger4:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer4 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer4 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -781,14 +774,14 @@ RustboroCity_EventScript_RivalTrigger4:: RustboroCity_EventScript_RivalTrigger5:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer5 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer5 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -797,14 +790,14 @@ RustboroCity_EventScript_RivalTrigger5:: RustboroCity_EventScript_RivalTrigger6:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer6 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer6 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -813,14 +806,14 @@ RustboroCity_EventScript_RivalTrigger6:: RustboroCity_EventScript_RivalTrigger7:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer7 + applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer7 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 3892ba40aed7..70a5312f9f75 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -67,6 +67,7 @@ "flag": "0" }, { + "local_id": "LOCALID_FOSSIL_SCIENTIST", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 8, diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index ba3a259ec33b..bd796aab6f55 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_FOSSIL_SCIENTIST, 5 - RustboroCity_DevonCorp_2F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_OnTransition .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 4ddb7271858e..ffe289e75960 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -28,6 +28,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEVON_CORP_3F_EMPLOYEE", "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ebf9044c54a1..aba43c575d20 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_DEVON_EMPLOYEE, 2 - RustboroCity_DevonCorp_3F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp @@ -11,8 +9,8 @@ RustboroCity_DevonCorp_3F_OnTransition: end RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: - setobjectxyperm LOCALID_DEVON_EMPLOYEE, 3, 2 - setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_DEVON_CORP_3F_EMPLOYEE, 3, 2 + setobjectmovementtype LOCALID_DEVON_CORP_3F_EMPLOYEE, MOVEMENT_TYPE_FACE_LEFT return RustboroCity_DevonCorp_3F_OnWarp: @@ -31,21 +29,21 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: lockall msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen + applymovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen waitmovement 0 delay 80 - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer + applymovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage playbgm MUS_FOLLOW_ME, FALSE - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident + applymovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm - applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk + applymovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index bb87670627d7..5591c344ff41 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -80,6 +80,7 @@ "flag": "0" }, { + "local_id": "LOCALID_WALDAS_DAD", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 5, diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 8e972182c131..038dfbf746d2 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_WALDAS_DAD, 6 - RustboroCity_Flat1_2F_MapScripts:: .byte 0 diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index ef07714add26..9883ac306adf 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_RUSTURF_TUNNEL_WANDAS_BF", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 5, @@ -67,6 +68,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" }, { + "local_id": "LOCALID_RUSTURF_TUNNEL_BRINEY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 4, @@ -80,6 +82,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY" }, { + "local_id": "LOCALID_RUSTURF_TUNNEL_GRUNT", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 14, "y": 5, @@ -93,6 +96,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, { + "local_id": "LOCALID_RUSTURF_TUNNEL_PEEKO", "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 14, "y": 4, @@ -132,6 +136,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RUSTURF_TUNNEL_WANDA", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 25, "y": 4, diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index a70510095679..fd545688027e 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,9 +1,3 @@ -.equ LOCALID_WANDAS_BF, 1 -.set LOCALID_BRINEY, 5 -.set LOCALID_GRUNT, 6 -.set LOCALID_PEEKO, 7 -.equ LOCALID_WANDA, 10 - RusturfTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame @@ -19,8 +13,8 @@ RusturfTunnel_OnTransition: end RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: - setobjectxyperm LOCALID_PEEKO, 13, 4 - setobjectxyperm LOCALID_GRUNT, 13, 5 + setobjectxyperm LOCALID_RUSTURF_TUNNEL_PEEKO, 13, 4 + setobjectxyperm LOCALID_RUSTURF_TUNNEL_GRUNT, 13, 5 return RusturfTunnel_EventScript_Wanda:: @@ -80,35 +74,35 @@ RusturfTunnel_EventScript_ClearTunnelScene:: RusturfTunnel_EventScript_BoyfriendApproachWanda1:: applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda1 + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda1 waitmovement 0 return RusturfTunnel_EventScript_BoyfriendApproachWanda2:: applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 - applymovement LOCALID_WANDA, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTURF_TUNNEL_WANDA, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return RusturfTunnel_EventScript_BoyfriendApproachWanda3:: applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 - applymovement LOCALID_WANDA, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RUSTURF_TUNNEL_WANDA, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return RusturfTunnel_EventScript_FaceWandasBoyfriend1:: - applymovement LOCALID_WANDAS_BF, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_WalkInPlaceFasterUp waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return RusturfTunnel_EventScript_FaceWandasBoyfriend2:: - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight waitmovement 0 return @@ -117,28 +111,28 @@ RusturfTunnel_EventScript_FaceWandasBoyfriend3:: RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: closemessage - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer waitmovement 0 return RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: - applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit1 - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit1 + applymovement LOCALID_RUSTURF_TUNNEL_WANDA, RusturfTunnel_Movement_WandaExit1 + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit1 waitmovement 0 return RusturfTunnel_EventScript_WandaAndBoyfriendExit:: applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit - applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit - applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit + applymovement LOCALID_RUSTURF_TUNNEL_WANDA, RusturfTunnel_Movement_WandaExit + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit waitmovement 0 return RusturfTunnel_EventScript_WandasBoyfriendNotice:: playse SE_PIN - applymovement LOCALID_WANDAS_BF, Common_Movement_ExclamationMark + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_WANDAS_BF, Common_Movement_Delay48 + applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_Delay48 waitmovement 0 return @@ -276,11 +270,11 @@ RusturfTunnel_EventScript_AquaGruntBackUp:: lockall msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, RusturfTunnel_Movement_GruntAndPeekoBackUp - applymovement LOCALID_PEEKO, RusturfTunnel_Movement_GruntAndPeekoBackUp + applymovement LOCALID_RUSTURF_TUNNEL_GRUNT, RusturfTunnel_Movement_GruntAndPeekoBackUp + applymovement LOCALID_RUSTURF_TUNNEL_PEEKO, RusturfTunnel_Movement_GruntAndPeekoBackUp waitmovement 0 - copyobjectxytoperm LOCALID_GRUNT - copyobjectxytoperm LOCALID_PEEKO + copyobjectxytoperm LOCALID_RUSTURF_TUNNEL_GRUNT + copyobjectxytoperm LOCALID_RUSTURF_TUNNEL_PEEKO setvar VAR_RUSTURF_TUNNEL_STATE, 3 releaseall end @@ -311,18 +305,18 @@ RusturfTunnel_EventScript_Grunt:: giveitem ITEM_DEVON_GOODS closemessage applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt - applymovement LOCALID_GRUNT, RusturfTunnel_Movement_GruntEscape + applymovement LOCALID_RUSTURF_TUNNEL_GRUNT, RusturfTunnel_Movement_GruntEscape waitmovement 0 - removeobject LOCALID_GRUNT + removeobject LOCALID_RUSTURF_TUNNEL_GRUNT delay 50 - addobject LOCALID_BRINEY - applymovement LOCALID_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko1 + addobject LOCALID_RUSTURF_TUNNEL_BRINEY + applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney - applymovement LOCALID_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko2 + applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT - applymovement LOCALID_BRINEY, Common_Movement_FacePlayer + applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_ThankYouLetsGoHomePeeko waitmessage @@ -332,11 +326,11 @@ RusturfTunnel_EventScript_Grunt:: waitmoncry closemessage applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit - applymovement LOCALID_BRINEY, RusturfTunnel_Movement_BrineyExit - applymovement LOCALID_PEEKO, RusturfTunnel_Movement_PeekoExit + applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, RusturfTunnel_Movement_BrineyExit + applymovement LOCALID_RUSTURF_TUNNEL_PEEKO, RusturfTunnel_Movement_PeekoExit waitmovement 0 - removeobject LOCALID_BRINEY - removeobject LOCALID_PEEKO + removeobject LOCALID_RUSTURF_TUNNEL_BRINEY + removeobject LOCALID_RUSTURF_TUNNEL_PEEKO clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS setvar VAR_RUSTBORO_CITY_STATE, 4 diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 7a25d4450cae..460359a82c77 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_TIDAL_EXIT_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 11, @@ -67,6 +68,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { + "local_id": "LOCALID_SS_TIDAL_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 9, "y": 10, diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 0d425889a7aa..d8012b113bff 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_SAILOR, 1 -.set LOCALID_SCOTT, 5 - SSTidalCorridor_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame .byte 0 @@ -188,20 +185,20 @@ SSTidalCorridor_EventScript_TrainerNotDefeated:: SSTidalCorridor_EventScript_ScottScene:: lockall - applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer + applymovement LOCALID_SS_TIDAL_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit - applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorMoveForScott - applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottExit + applymovement LOCALID_SS_TIDAL_EXIT_SAILOR, SSTidalCorridor_Movement_SailorMoveForScott + applymovement LOCALID_SS_TIDAL_SCOTT, SSTidalCorridor_Movement_ScottExit waitmovement 0 playse SE_EXIT waitse - removeobject LOCALID_SCOTT - applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorReturn + removeobject LOCALID_SS_TIDAL_SCOTT + applymovement LOCALID_SS_TIDAL_EXIT_SAILOR, SSTidalCorridor_Movement_SailorReturn waitmovement 0 delay 30 setflag FLAG_MET_SCOTT_ON_SS_TIDAL diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index dee1e40629ff..4fffe8afb9e3 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -31,6 +31,7 @@ ], "object_events": [ { + "local_id": "LOCALID_SAFARI_EXIT_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 32, "y": 34, diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 6b4c774c2ba5..c839789511b4 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_ATTENDANT, 1 - SafariZone_South_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_OnFrame @@ -13,9 +11,9 @@ SafariZone_South_EventScript_EnterSafariZone:: lockall applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerEnter waitmovement 0 - applymovement LOCALID_ATTENDANT, SafariZone_South_Movement_ExitAttendantBlockDoor + applymovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_ExitAttendantBlockDoor waitmovement 0 - setobjectxyperm LOCALID_ATTENDANT, 32, 34 + setobjectxyperm LOCALID_SAFARI_EXIT_ATTENDANT, 32, 34 setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -25,7 +23,7 @@ SafariZone_South_OnTransition: end SafariZone_South_EventScript_SetExitAttendantAside:: - setobjectxyperm LOCALID_ATTENDANT, 31, 34 + setobjectxyperm LOCALID_SAFARI_EXIT_ATTENDANT, 31, 34 return SafariZone_South_Movement_PlayerEnter: @@ -74,7 +72,7 @@ SafariZone_South_EventScript_ExitEarly:: end SafariZone_South_EventScript_ExitEarlyNorth:: - applymovement LOCALID_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantNorth + applymovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantNorth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth waitmovement 0 @@ -82,7 +80,7 @@ SafariZone_South_EventScript_ExitEarlyNorth:: end SafariZone_South_EventScript_ExitEarlyEast:: - applymovement LOCALID_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantEast + applymovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantEast waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast waitmovement 0 diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 5e88d71432e0..7968d7afe9ef 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 2, diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index eec69e6f8011..05bf490e7d4c 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_GRUNT, 1 - SeafloorCavern_Entrance_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_OnResume .byte 0 @@ -14,9 +12,9 @@ SeafloorCavern_Entrance_EventScript_Grunt:: goto_if_eq VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1, SeafloorCavern_Entrance_EventScript_GruntSpeechShort waitse playse SE_PIN - applymovement LOCALID_GRUNT, Common_Movement_ExclamationMark + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_GRUNT, Common_Movement_Delay48 + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_Delay48 waitmovement 0 delay 20 call_if_eq VAR_FACING, DIR_WEST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest @@ -24,10 +22,10 @@ SeafloorCavern_Entrance_EventScript_Grunt:: call_if_eq VAR_FACING, DIR_NORTH, SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth delay 30 setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 - copyobjectxytoperm LOCALID_GRUNT + copyobjectxytoperm LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterUp waitmovement 0 releaseall end @@ -38,23 +36,23 @@ SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: call_if_eq VAR_FACING, DIR_NORTH, SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 04fb621df1a9..241a53fe692a 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SEAFLOOR_CAVERN_KYOGRE", "graphics_id": "OBJ_EVENT_GFX_KYOGRE_FRONT", "x": 17, "y": 38, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE" }, { + "local_id": "LOCALID_SEAFLOOR_CAVERN_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 9, "y": 42, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" }, { + "local_id": "LOCALID_SEAFLOOR_CAVERN_MAXIE", "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 9, "y": 42, @@ -54,6 +57,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" }, { + "local_id": "LOCALID_SEAFLOOR_CAVERN_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 8, "y": 41, @@ -67,6 +71,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, { + "local_id": "LOCALID_SEAFLOOR_CAVERN_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 8, "y": 42, @@ -93,6 +98,7 @@ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_EARTHQUAKE" }, { + "local_id": "LOCALID_SEAFLOOR_CAVERN_KYOGRE_SLEEPING", "graphics_id": "OBJ_EVENT_GFX_KYOGRE_ASLEEP", "x": 17, "y": 38, diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 63e6baf3c77e..5e0727524257 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -1,19 +1,12 @@ -.set LOCALID_KYOGRE, 1 -.set LOCALID_ARCHIE, 2 -.set LOCALID_MAXIE, 3 -.set LOCALID_GRUNT_1, 4 -.set LOCALID_GRUNT_2, 5 -.set LOCALID_KYOGRE_SLEEPING, 7 - SeafloorCavern_Room9_MapScripts:: .byte 0 SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: lockall - setvar VAR_0x8004, LOCALID_ARCHIE - setvar VAR_0x8005, LOCALID_MAXIE - setvar VAR_0x8006, LOCALID_GRUNT_1 - setvar VAR_0x8007, LOCALID_GRUNT_2 + setvar VAR_0x8004, LOCALID_SEAFLOOR_CAVERN_ARCHIE + setvar VAR_0x8005, LOCALID_SEAFLOOR_CAVERN_MAXIE + setvar VAR_0x8006, LOCALID_SEAFLOOR_CAVERN_GRUNT_1 + setvar VAR_0x8007, LOCALID_SEAFLOOR_CAVERN_GRUNT_2 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 @@ -55,11 +48,11 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 150 - removeobject LOCALID_KYOGRE_SLEEPING - addobject LOCALID_KYOGRE + removeobject LOCALID_SEAFLOOR_CAVERN_KYOGRE_SLEEPING + addobject LOCALID_SEAFLOOR_CAVERN_KYOGRE waitstate delay 60 - applymovement LOCALID_KYOGRE, SeafloorCavern_Room9_Movement_KyogreApproach + applymovement LOCALID_SEAFLOOR_CAVERN_KYOGRE, SeafloorCavern_Room9_Movement_KyogreApproach waitmovement 0 special FadeOutOrbEffect waitstate @@ -69,9 +62,9 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SeafloorCavern_Room9_Movement_KyogreExit + applymovement LOCALID_SEAFLOOR_CAVERN_KYOGRE, SeafloorCavern_Room9_Movement_KyogreExit waitmovement 0 - removeobject LOCALID_KYOGRE + removeobject LOCALID_SEAFLOOR_CAVERN_KYOGRE delay 4 setvar VAR_0x8004, 2 @ vertical pan setvar VAR_0x8005, 2 @ horizontal pan @@ -80,10 +73,10 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: special ShakeCamera waitstate delay 30 - setvar VAR_0x8004, LOCALID_ARCHIE - setvar VAR_0x8005, LOCALID_MAXIE - setvar VAR_0x8006, LOCALID_GRUNT_1 - setvar VAR_0x8007, LOCALID_GRUNT_2 + setvar VAR_0x8004, LOCALID_SEAFLOOR_CAVERN_ARCHIE + setvar VAR_0x8005, LOCALID_SEAFLOOR_CAVERN_MAXIE + setvar VAR_0x8006, LOCALID_SEAFLOOR_CAVERN_GRUNT_1 + setvar VAR_0x8007, LOCALID_SEAFLOOR_CAVERN_GRUNT_2 msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT playse SE_PC_LOGIN applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 4c7ea03d156b..888e05805ddd 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_RAYQUAZA_SLEEPING", "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA", "x": 14, "y": 7, diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 19cd7e4f42b6..8b2f1bcc9bab 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RAYQUAZA_SLEEPING, 1 - SkyPillar_Top_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index eb01d3c16653..90835cef3b84 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -31,6 +31,7 @@ ], "object_events": [ { + "local_id": "LOCALID_SLATEPORT_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 11, @@ -44,6 +45,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_MAN_1", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 34, "y": 29, @@ -57,6 +59,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_RICH_BOY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 5, "y": 13, @@ -83,6 +86,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 31, "y": 27, @@ -96,6 +100,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_COOK", "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 5, "y": 43, @@ -109,6 +114,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_OLD_WOMAN", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 37, @@ -122,6 +128,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_GIRL", "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 42, @@ -135,6 +142,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_TY", "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 29, "y": 13, @@ -148,6 +156,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { + "local_id": "LOCALID_SLATEPORT_GABBY", "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 28, "y": 14, @@ -161,6 +170,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { + "local_id": "LOCALID_SLATEPORT_CAPT_STERN", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 28, "y": 13, @@ -252,6 +262,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 27, @@ -265,6 +276,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 29, "y": 27, @@ -357,6 +369,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_4", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 22, "y": 27, @@ -370,6 +383,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_5", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 23, "y": 27, @@ -383,6 +397,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_6", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 24, "y": 27, @@ -396,6 +411,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_7", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 26, @@ -409,6 +425,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_8", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 20, "y": 26, @@ -422,6 +439,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_9", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 26, "y": 27, @@ -448,6 +466,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { + "local_id": "LOCALID_SLATEPORT_GRUNT_11", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 25, "y": 27, @@ -474,6 +493,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SLATEPORT_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 10, "y": 12, diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index ae3910750e6c..bfbd428732a1 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,26 +1,3 @@ -.set LOCALID_FAT_MAN, 1 -.set LOCALID_MAN_1, 2 -.set LOCALID_RICH_BOY, 3 -.set LOCALID_GRUNT_1, 5 -.set LOCALID_COOK, 6 -.set LOCALID_OLD_WOMAN, 7 -.set LOCALID_GIRL, 8 -.set LOCALID_TY, 9 -.set LOCALID_GABBY, 10 -.set LOCALID_CAPT_STERN, 11 -.set LOCALID_GRUNT_2, 18 -.set LOCALID_GRUNT_3, 19 -.set LOCALID_GRUNT_4, 26 -.set LOCALID_GRUNT_5, 27 -.set LOCALID_GRUNT_6, 28 -.set LOCALID_GRUNT_7, 29 -.set LOCALID_GRUNT_8, 30 -.set LOCALID_GRUNT_9, 31 -.set LOCALID_GRUNT_11, 33 -.set LOCALID_SCOTT, 35 - -@ Note: LOCALID_SLATEPORT_ENERGY_GURU is a local id for this map used elsewhere. It's defined in event_objects.h - SlateportCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame @@ -40,33 +17,33 @@ SlateportCity_EventScript_EnterSlateport:: return SlateportCity_EventScript_MovePeopleForSternInterview:: - setobjectxyperm LOCALID_CAPT_STERN, 28, 13 - setobjectxyperm LOCALID_OLD_WOMAN, 25, 13 - setobjectxyperm LOCALID_RICH_BOY, 25, 14 - setobjectxyperm LOCALID_COOK, 27, 16 - setobjectxyperm LOCALID_GIRL, 28, 16 - setobjectxyperm LOCALID_FAT_MAN, 29, 16 - setobjectxyperm LOCALID_MAN_1, 31, 14 - setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_DOWN - setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - setobjectmovementtype LOCALID_RICH_BOY, MOVEMENT_TYPE_FACE_UP_AND_RIGHT - setobjectmovementtype LOCALID_COOK, MOVEMENT_TYPE_FACE_UP - setobjectmovementtype LOCALID_GIRL, MOVEMENT_TYPE_FACE_UP - setobjectmovementtype LOCALID_FAT_MAN, MOVEMENT_TYPE_FACE_UP - setobjectmovementtype LOCALID_MAN_1, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_SLATEPORT_CAPT_STERN, 28, 13 + setobjectxyperm LOCALID_SLATEPORT_OLD_WOMAN, 25, 13 + setobjectxyperm LOCALID_SLATEPORT_RICH_BOY, 25, 14 + setobjectxyperm LOCALID_SLATEPORT_COOK, 27, 16 + setobjectxyperm LOCALID_SLATEPORT_GIRL, 28, 16 + setobjectxyperm LOCALID_SLATEPORT_FAT_MAN, 29, 16 + setobjectxyperm LOCALID_SLATEPORT_MAN_1, 31, 14 + setobjectmovementtype LOCALID_SLATEPORT_CAPT_STERN, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_SLATEPORT_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + setobjectmovementtype LOCALID_SLATEPORT_RICH_BOY, MOVEMENT_TYPE_FACE_UP_AND_RIGHT + setobjectmovementtype LOCALID_SLATEPORT_COOK, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_SLATEPORT_GIRL, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_SLATEPORT_FAT_MAN, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_SLATEPORT_MAN_1, MOVEMENT_TYPE_FACE_LEFT return SlateportCity_EventScript_SetReadyForScottScene:: setflag FLAG_HIDE_MAP_NAME_POPUP getplayerxy VAR_0x8004, VAR_0x8005 goto_if_eq VAR_0x8004, 30, SlateportCity_EventScript_MoveScottLeft - setobjectxyperm LOCALID_SCOTT, 23, 27 - setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SLATEPORT_SCOTT, 23, 27 + setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_EventScript_MoveScottLeft:: - setobjectxyperm LOCALID_SCOTT, 22, 27 - setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SLATEPORT_SCOTT, 22, 27 + setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_OnFrame: @@ -75,17 +52,17 @@ SlateportCity_OnFrame: SlateportCity_EventScript_ScottScene:: lockall - addobject LOCALID_SCOTT + addobject LOCALID_SLATEPORT_SCOTT applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott - applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottApproachPlayer + applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottApproachPlayer waitmovement 0 msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT - applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT closemessage @@ -98,11 +75,11 @@ SlateportCity_EventScript_ScottScene:: setflag FLAG_ENABLE_SCOTT_MATCH_CALL msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExit + applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExit waitmovement 0 - removeobject LOCALID_SCOTT - setobjectxyperm LOCALID_SCOTT, 10, 12 - setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_DOWN + removeobject LOCALID_SLATEPORT_SCOTT + setobjectxyperm LOCALID_SLATEPORT_SCOTT, 10, 12 + setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2 addvar VAR_SCOTT_STATE, 1 @@ -372,7 +349,7 @@ SlateportCity_EventScript_AquaGrunt1:: faceplayer msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_1, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -382,7 +359,7 @@ SlateportCity_EventScript_AquaGrunt2:: faceplayer msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_2, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -392,7 +369,7 @@ SlateportCity_EventScript_AquaGrunt3:: faceplayer msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_3, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -402,7 +379,7 @@ SlateportCity_EventScript_AquaGrunt4:: faceplayer msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_4, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -412,7 +389,7 @@ SlateportCity_EventScript_AquaGrunt5:: faceplayer msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_5, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -422,7 +399,7 @@ SlateportCity_EventScript_AquaGrunt6:: faceplayer msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_6, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_6, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -432,7 +409,7 @@ SlateportCity_EventScript_AquaGrunt7:: faceplayer msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_7, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -442,7 +419,7 @@ SlateportCity_EventScript_AquaGrunt8:: faceplayer msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_8, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -451,31 +428,31 @@ SlateportCity_EventScript_AquaGrunt9:: lock faceplayer playse SE_PIN - applymovement LOCALID_GRUNT_9, Common_Movement_ExclamationMark + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_GRUNT_9, Common_Movement_Delay48 + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection waitmovement 0 - applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt + applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt waitmovement 0 - applymovement LOCALID_GRUNT_9, Common_Movement_FacePlayer + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection waitmovement 0 - applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt + applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt waitmovement 0 msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_9, Common_Movement_FacePlayer + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer waitmovement 0 - applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt + applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt waitmovement 0 - applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -494,7 +471,7 @@ SlateportCity_EventScript_AquaGrunt11:: faceplayer msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_11, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SLATEPORT_GRUNT_11, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -578,48 +555,48 @@ SlateportCity_EventScript_CaptStern:: msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GABBY, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_SLATEPORT_GABBY, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 10 - applymovement LOCALID_TY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SLATEPORT_TY, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 25 - applymovement LOCALID_CAPT_STERN, SlateportCity_Movement_SternWatchGabbyAndTyExit + applymovement LOCALID_SLATEPORT_CAPT_STERN, SlateportCity_Movement_SternWatchGabbyAndTyExit applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern - applymovement LOCALID_GABBY, SlateportCity_Movement_GabbyExit - applymovement LOCALID_TY, SlateportCity_Movement_TyExit + applymovement LOCALID_SLATEPORT_GABBY, SlateportCity_Movement_GabbyExit + applymovement LOCALID_SLATEPORT_TY, SlateportCity_Movement_TyExit waitmovement 0 - removeobject LOCALID_GABBY - removeobject LOCALID_TY + removeobject LOCALID_SLATEPORT_GABBY + removeobject LOCALID_SLATEPORT_TY msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT - applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT playbgm MUS_ENCOUNTER_AQUA, FALSE msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT - applymovement LOCALID_COOK, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_FAT_MAN, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_OLD_WOMAN, SlateportCity_Movement_OldWomanConcern - applymovement LOCALID_RICH_BOY, Common_Movement_QuestionMark - applymovement LOCALID_MAN_1, SlateportCity_Movement_ManConcern + applymovement LOCALID_SLATEPORT_COOK, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SLATEPORT_FAT_MAN, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SLATEPORT_OLD_WOMAN, SlateportCity_Movement_OldWomanConcern + applymovement LOCALID_SLATEPORT_RICH_BOY, Common_Movement_QuestionMark + applymovement LOCALID_SLATEPORT_MAN_1, SlateportCity_Movement_ManConcern waitmovement 0 - applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT playse SE_PIN - applymovement LOCALID_CAPT_STERN, Common_Movement_ExclamationMark + applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_CAPT_STERN, Common_Movement_Delay48 + applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CAPT_STERN, SlateportCity_Movement_SternEnterHarbor + applymovement LOCALID_SLATEPORT_CAPT_STERN, SlateportCity_Movement_SternEnterHarbor applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor waitmovement 0 - removeobject LOCALID_CAPT_STERN + removeobject LOCALID_SLATEPORT_CAPT_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT @@ -899,18 +876,18 @@ SlateportCity_EventScript_ScottBattleTentScene:: waitmovement 0 opendoor 10, 12 waitdooranim - addobject LOCALID_SCOTT + addobject LOCALID_SLATEPORT_SCOTT applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown - applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExitBattleTent + applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExitBattleTent waitmovement 0 closedoor 10, 12 waitdooranim msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT closemessage applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit - applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExitAfterBattleTent + applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExitAfterBattleTent waitmovement 0 - removeobject LOCALID_SCOTT + removeobject LOCALID_SLATEPORT_SCOTT addvar VAR_SCOTT_STATE, 1 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3 releaseall diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 05fe77c61c4f..11b530cd1e7b 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -54,6 +54,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { + "local_id": "LOCALID_SLATEPORT_HARBOR_CAPT_STERN", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 13, @@ -67,6 +68,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" }, { + "local_id": "LOCALID_SLATEPORT_HARBOR_SS_TIDAL", "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, @@ -80,6 +82,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" }, { + "local_id": "LOCALID_SLATEPORT_HARBOR_GRUNT", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 7, "y": 10, @@ -93,6 +96,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" }, { + "local_id": "LOCALID_SLATEPORT_HARBOR_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 8, "y": 10, @@ -106,6 +110,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" }, { + "local_id": "LOCALID_SLATEPORT_HARBOR_SUBMARINE", "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 7, "y": 9, diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index b2a71f2b7c3c..ca90fa897e5e 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,9 +1,3 @@ -.set LOCALID_CAPT_STERN, 4 -.set LOCALID_SS_TIDAL, 5 -.set LOCALID_GRUNT, 6 -.set LOCALID_ARCHIE, 7 -.set LOCALID_SUBMARINE, 8 - SlateportCity_Harbor_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_OnTransition .byte 0 @@ -21,8 +15,8 @@ SlateportCity_Harbor_EventScript_ShowSSTidal:: SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: savebgm MUS_ENCOUNTER_AQUA - setobjectxyperm LOCALID_CAPT_STERN, 12, 13 - setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_SLATEPORT_HARBOR_CAPT_STERN, 12, 13 + setobjectmovementtype LOCALID_SLATEPORT_HARBOR_CAPT_STERN, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS return @@ -53,20 +47,20 @@ SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: end SlateportCity_Harbor_EventScript_AquaEscapeScene:: - applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SLATEPORT_HARBOR_ARCHIE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SLATEPORT_HARBOR_GRUNT, Common_Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT, SlateportCity_Harbor_Movement_AquaBoardSub - applymovement LOCALID_ARCHIE, SlateportCity_Harbor_Movement_AquaBoardSub - applymovement LOCALID_SUBMARINE, SlateportCity_Harbor_Movement_SubmarineExit + applymovement LOCALID_SLATEPORT_HARBOR_GRUNT, SlateportCity_Harbor_Movement_AquaBoardSub + applymovement LOCALID_SLATEPORT_HARBOR_ARCHIE, SlateportCity_Harbor_Movement_AquaBoardSub + applymovement LOCALID_SLATEPORT_HARBOR_SUBMARINE, SlateportCity_Harbor_Movement_SubmarineExit waitmovement 0 - removeobject LOCALID_GRUNT - removeobject LOCALID_ARCHIE - removeobject LOCALID_SUBMARINE + removeobject LOCALID_SLATEPORT_HARBOR_GRUNT + removeobject LOCALID_SLATEPORT_HARBOR_ARCHIE + removeobject LOCALID_SLATEPORT_HARBOR_SUBMARINE setvar VAR_SLATEPORT_HARBOR_STATE, 2 setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_HIDE_LILYCOVE_MOTEL_SCOTT @@ -78,27 +72,27 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: closemessage setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE - copyobjectxytoperm LOCALID_CAPT_STERN - setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_RIGHT + copyobjectxytoperm LOCALID_SLATEPORT_HARBOR_CAPT_STERN + setobjectmovementtype LOCALID_SLATEPORT_HARBOR_CAPT_STERN, MOVEMENT_TYPE_FACE_RIGHT releaseall end SlateportCity_Harbor_EventScript_SternApproachPlayer0:: - applymovement LOCALID_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer0 + applymovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer0 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return SlateportCity_Harbor_EventScript_SternApproachPlayer1:: - applymovement LOCALID_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer1 + applymovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return SlateportCity_Harbor_EventScript_SternApproachPlayer:: - applymovement LOCALID_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer + applymovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -235,7 +229,7 @@ SlateportCity_Harbor_EventScript_BoardFerry:: call_if_eq VAR_FACING, DIR_EAST, SlateportCity_Harbor_EventScript_BoardFerryEast delay 30 hideobjectat OBJ_EVENT_ID_PLAYER, 0 - setvar VAR_0x8004, LOCALID_SS_TIDAL + setvar VAR_0x8004, LOCALID_SLATEPORT_HARBOR_SS_TIDAL call Common_EventScript_FerryDepart return diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index fd3468a52d3f..14d6b0583d09 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -171,6 +171,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { + "local_id": "LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 9, "y": 4, diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 8b464f73ae6c..5c0244288abc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_FAMILIAR_GRUNT, 13 - SlateportCity_OceanicMuseum_1F_MapScripts:: .byte 0 @@ -146,9 +144,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: faceplayer delay 8 playse SE_PIN - applymovement LOCALID_FAMILIAR_GRUNT, Common_Movement_ExclamationMark + applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_FAMILIAR_GRUNT, Common_Movement_Delay48 + applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT giveitem ITEM_TM_THIEF @@ -164,20 +162,20 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth - applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth + applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: - applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit + applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast - applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit + applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end @@ -185,7 +183,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT playse SE_EXIT - removeobject LOCALID_FAMILIAR_GRUNT + removeobject LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index bab9c1ea5813..7ada1f8ac16f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_OCEANIC_MUSEUM_2F_CAPT_STERN", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 6, @@ -28,6 +29,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, { + "local_id": "LOCALID_OCEANIC_MUSEUM_2F_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 6, "y": 1, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" }, { + "local_id": "LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 1, @@ -54,6 +57,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" }, { + "local_id": "LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 1, diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 59131fd7ee2a..95f7cdec7d08 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -1,8 +1,3 @@ -.set LOCALID_CAPT_STERN, 1 -.set LOCALID_ARCHIE, 2 -.set LOCALID_GRUNT_1, 3 -.set LOCALID_GRUNT_2, 4 - SlateportCity_OceanicMuseum_2F_MapScripts:: .byte 0 @@ -12,14 +7,14 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_AQUA, TRUE - addobject LOCALID_GRUNT_1 - applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter + addobject LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1 + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter waitmovement 0 - addobject LOCALID_GRUNT_2 - applymovement LOCALID_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter + addobject LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2 + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter waitmovement 0 - applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach - applymovement LOCALID_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach waitmovement 0 call_if_eq VAR_FACING, DIR_SOUTH, SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts call_if_eq VAR_FACING, DIR_EAST, SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts @@ -28,43 +23,43 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: msgbox SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 call_if_eq VAR_FACING, DIR_SOUTH, SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth call_if_eq VAR_FACING, DIR_WEST, SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_1, SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 - applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_2, SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat - applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 - applymovement LOCALID_GRUNT_1, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_MeddlingKid, MSGBOX_DEFAULT closemessage delay 35 - addobject LOCALID_ARCHIE - applymovement LOCALID_ARCHIE, SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter - applymovement LOCALID_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie + addobject LOCALID_OCEANIC_MUSEUM_2F_ARCHIE + applymovement LOCALID_OCEANIC_MUSEUM_2F_ARCHIE, SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter + applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARCHIE, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer + applymovement LOCALID_OCEANIC_MUSEUM_2F_ARCHIE, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_ArchieWarning, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY fadedefaultbgm fadescreen FADE_TO_BLACK - removeobject LOCALID_ARCHIE - removeobject LOCALID_GRUNT_1 - removeobject LOCALID_GRUNT_2 + removeobject LOCALID_OCEANIC_MUSEUM_2F_ARCHIE + removeobject LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1 + removeobject LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2 fadescreen FADE_FROM_BLACK delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS @@ -79,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: playfanfare MUS_HEAL waitfanfare special HealPlayerParty - removeobject LOCALID_CAPT_STERN + removeobject LOCALID_OCEANIC_MUSEUM_2F_CAPT_STERN setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA call_if_eq VAR_REGISTER_BIRCH_STATE, 0, SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch setflag FLAG_DELIVERED_DEVON_GOODS @@ -100,7 +95,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: return SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: - applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_OCEANIC_MUSEUM_2F_CAPT_STERN, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 4414fcfb1218..cd5bd174aac7 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_DOCK", "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 5, diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 8b4a4de54a69..cf2752fd2ce8 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_DOCK, 1 - SlateportCity_SternsShipyard_1F_MapScripts:: .byte 0 diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index a436d72cb3b4..d1d9242a5797 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -15,6 +15,7 @@ "connections": [], "object_events": [ { + "local_id": "LOCALID_SOOTOPOLIS_EXPERT", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 31, "y": 18, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOOTOPOLIS_WOMAN_2", "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 47, "y": 33, @@ -41,6 +43,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { + "local_id": "LOCALID_KIRI", "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 9, "y": 43, @@ -54,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOOTOPOLIS_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 51, "y": 14, @@ -67,6 +71,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOOTOPOLIS_BOY_1", "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 43, "y": 26, @@ -93,6 +98,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" }, { + "local_id": "LOCALID_SOOTOPOLIS_STEVEN", "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 20, "y": 36, @@ -106,6 +112,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" }, { + "local_id": "LOCALID_SOOTOPOLIS_WOMAN_1", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 49, "y": 34, @@ -119,6 +126,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOOTOPOLIS_GROUDON", "graphics_id": "OBJ_EVENT_GFX_GROUDON_SIDE", "x": 28, "y": 44, @@ -132,6 +140,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" }, { + "local_id": "LOCALID_SOOTOPOLIS_KYOGRE", "graphics_id": "OBJ_EVENT_GFX_KYOGRE_SIDE", "x": 34, "y": 44, @@ -145,6 +154,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" }, { + "local_id": "LOCALID_SOOTOPOLIS_RAYQUAZA", "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA", "x": 31, "y": 41, @@ -158,6 +168,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" }, { + "local_id": "LOCALID_SOOTOPOLIS_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 44, @@ -171,6 +182,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { + "local_id": "LOCALID_SOOTOPOLIS_GIRL", "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 14, "y": 42, @@ -184,6 +196,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { + "local_id": "LOCALID_SOOTOPOLIS_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 17, "y": 40, @@ -197,6 +210,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { + "local_id": "LOCALID_SOOTOPOLIS_BOY_2", "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 19, "y": 37, @@ -210,6 +224,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { + "local_id": "LOCALID_SOOTOPOLIS_MAXIE", "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 29, "y": 33, @@ -223,6 +238,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" }, { + "local_id": "LOCALID_SOOTOPOLIS_ARCHIE", "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 31, "y": 33, @@ -236,6 +252,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" }, { + "local_id": "LOCALID_SOOTOPOLIS_WALLACE", "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 31, "y": 18, diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 16e2d0325276..ada86689ad9d 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,21 +1,3 @@ -.set LOCALID_EXPERT, 1 -.set LOCALID_WOMAN_2, 2 -.set LOCALID_KIRI, 3 -.set LOCALID_NINJA_BOY, 4 -.set LOCALID_BOY_1, 5 -.set LOCALID_STEVEN, 7 -.set LOCALID_WOMAN_1, 8 -.set LOCALID_GROUDON, 9 -.set LOCALID_KYOGRE, 10 -.set LOCALID_RAYQUAZA, 11 -.set LOCALID_MANIAC, 12 -.set LOCALID_GIRL, 13 -.set LOCALID_BLACK_BELT, 14 -.set LOCALID_BOY_2, 15 -.set LOCALID_MAXIE, 16 -.set LOCALID_ARCHIE, 17 -.set LOCALID_WALLACE, 18 - SootopolisCity_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition @@ -73,13 +55,13 @@ SootopolisCity_EventScript_HideMapNamePopup:: SootopolisCity_EventScript_SetBattleSpectators:: setobjectxyperm LOCALID_KIRI, 13, 48 - setobjectxyperm LOCALID_BOY_1, 46, 32 - setobjectxyperm LOCALID_NINJA_BOY, 48, 41 - setobjectxyperm LOCALID_WOMAN_1, 45, 43 + setobjectxyperm LOCALID_SOOTOPOLIS_BOY_1, 46, 32 + setobjectxyperm LOCALID_SOOTOPOLIS_NINJA_BOY, 48, 41 + setobjectxyperm LOCALID_SOOTOPOLIS_WOMAN_1, 45, 43 setobjectmovementtype LOCALID_KIRI, MOVEMENT_TYPE_FACE_UP - setobjectmovementtype LOCALID_BOY_1, MOVEMENT_TYPE_FACE_LEFT - setobjectmovementtype LOCALID_NINJA_BOY, MOVEMENT_TYPE_FACE_LEFT - setobjectmovementtype LOCALID_WOMAN_1, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype LOCALID_SOOTOPOLIS_BOY_1, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype LOCALID_SOOTOPOLIS_NINJA_BOY, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype LOCALID_SOOTOPOLIS_WOMAN_1, MOVEMENT_TYPE_FACE_LEFT return SootopolisCity_EventScript_SetLayout:: @@ -119,43 +101,43 @@ SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: return SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos:: - setobjectxyperm LOCALID_EXPERT, 30, 18 - setobjectxyperm LOCALID_STEVEN, 32, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_EXPERT, 30, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_STEVEN, 32, 18 return SootopolisCity_EventScript_SetExitCaveOfOriginObjPos:: - setobjectxyperm LOCALID_EXPERT, 30, 18 - setobjectxyperm LOCALID_WALLACE, 31, 18 - setobjectxyperm LOCALID_STEVEN, 32, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_EXPERT, 30, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_WALLACE, 31, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_STEVEN, 32, 18 end SootopolisCity_EventScript_SetOutsideGymObjPos:: - setobjectxyperm LOCALID_EXPERT, 31, 18 - setobjectxyperm LOCALID_STEVEN, 29, 33 - setobjectxyperm LOCALID_MAXIE, 33, 35 - setobjectxyperm LOCALID_ARCHIE, 34, 35 + setobjectxyperm LOCALID_SOOTOPOLIS_EXPERT, 31, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_STEVEN, 29, 33 + setobjectxyperm LOCALID_SOOTOPOLIS_MAXIE, 33, 35 + setobjectxyperm LOCALID_SOOTOPOLIS_ARCHIE, 34, 35 call_if_eq VAR_SOOTOPOLIS_WALLACE_STATE, 0, SootopolisCity_EventScript_SetWallaceMiddle call_if_eq VAR_SOOTOPOLIS_WALLACE_STATE, 1, SootopolisCity_EventScript_SetWallaceRight call_if_eq VAR_SOOTOPOLIS_WALLACE_STATE, 2, SootopolisCity_EventScript_SetWallaceLeft return SootopolisCity_EventScript_SetWallaceMiddle:: - setobjectxyperm LOCALID_WALLACE, 31, 33 - setobjectmovementtype LOCALID_WALLACE, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_SOOTOPOLIS_WALLACE, 31, 33 + setobjectmovementtype LOCALID_SOOTOPOLIS_WALLACE, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_SetWallaceRight:: - setobjectxyperm LOCALID_WALLACE, 32, 33 - setobjectmovementtype LOCALID_WALLACE, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_SOOTOPOLIS_WALLACE, 32, 33 + setobjectmovementtype LOCALID_SOOTOPOLIS_WALLACE, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_SetWallaceLeft:: - setobjectxyperm LOCALID_WALLACE, 30, 33 - setobjectmovementtype LOCALID_WALLACE, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_SOOTOPOLIS_WALLACE, 30, 33 + setobjectmovementtype LOCALID_SOOTOPOLIS_WALLACE, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_SetExpertBlockCaveEntrance:: - setobjectxyperm LOCALID_EXPERT, 31, 18 + setobjectxyperm LOCALID_SOOTOPOLIS_EXPERT, 31, 18 return SootopolisCity_OnWarp: @@ -207,14 +189,14 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene special Script_DoRayquazaScene waitstate - applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_GROUDON, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_SOOTOPOLIS_KYOGRE, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SOOTOPOLIS_GROUDON, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 60 waitse playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreAttack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonDefend waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -222,13 +204,13 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreMoveBack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreMoveBack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonMoveBack waitmovement 0 waitse playmoncry SPECIES_GROUDON, CRY_MODE_ENCOUNTER - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreDefend + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonAttack waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -236,13 +218,13 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreMoveBack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreMoveBack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonMoveBack waitmovement 0 waitse playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreAttack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonDefend waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -250,12 +232,12 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreMoveBack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreMoveBack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonMoveBack waitmovement 0 special SpawnCameraObject - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreIdle - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonIdle + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreIdle + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonIdle applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter waitmovement 0 special RemoveCameraObject @@ -307,14 +289,14 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene special Script_DoRayquazaScene waitstate - applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_GROUDON, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_SOOTOPOLIS_KYOGRE, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_SOOTOPOLIS_GROUDON, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 60 waitse playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreAttack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonDefend waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -322,13 +304,13 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreMoveBack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreMoveBack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonMoveBack waitmovement 0 waitse playmoncry SPECIES_GROUDON, CRY_MODE_ENCOUNTER - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreDefend + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonAttack waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -336,13 +318,13 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreMoveBack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreMoveBack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonMoveBack waitmovement 0 waitse playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreAttack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonDefend waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -350,12 +332,12 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreMoveBack - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreMoveBack + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonMoveBack waitmovement 0 special SpawnCameraObject - applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreIdle - applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonIdle + applymovement LOCALID_SOOTOPOLIS_KYOGRE, SootopolisCity_Movement_KyogreIdle + applymovement LOCALID_SOOTOPOLIS_GROUDON, SootopolisCity_Movement_GroudonIdle applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToDive waitmovement 0 special RemoveCameraObject @@ -492,9 +474,9 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: delay 60 fadescreenspeed FADE_TO_BLACK, 8 call SootopolisCity_EventScript_SetRoughWater - removeobject LOCALID_GROUDON - removeobject LOCALID_KYOGRE - addobject LOCALID_RAYQUAZA + removeobject LOCALID_SOOTOPOLIS_GROUDON + removeobject LOCALID_SOOTOPOLIS_KYOGRE + addobject LOCALID_SOOTOPOLIS_RAYQUAZA setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate @@ -521,9 +503,9 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: waitmoncry setweather WEATHER_NONE doweather - applymovement LOCALID_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff + applymovement LOCALID_SOOTOPOLIS_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff waitmovement 0 - removeobject LOCALID_RAYQUAZA + removeobject LOCALID_SOOTOPOLIS_RAYQUAZA special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL @@ -545,9 +527,9 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: delay 60 fadescreenspeed FADE_TO_BLACK, 8 call SootopolisCity_EventScript_SetRoughWater - removeobject LOCALID_GROUDON - removeobject LOCALID_KYOGRE - addobject LOCALID_RAYQUAZA + removeobject LOCALID_SOOTOPOLIS_GROUDON + removeobject LOCALID_SOOTOPOLIS_KYOGRE + addobject LOCALID_SOOTOPOLIS_RAYQUAZA setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate @@ -574,9 +556,9 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: waitmoncry setweather WEATHER_NONE doweather - applymovement LOCALID_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff + applymovement LOCALID_SOOTOPOLIS_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff waitmovement 0 - removeobject LOCALID_RAYQUAZA + removeobject LOCALID_SOOTOPOLIS_RAYQUAZA special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL @@ -771,12 +753,12 @@ SootopolisCity_EventScript_KiriLikeSeasonBornIn:: SootopolisCity_EventScript_Woman2:: lockall - applymovement LOCALID_WOMAN_2, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_WOMAN_2, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Woman2Rayquaza msgbox SootopolisCity_Text_WeatherWentWild, MSGBOX_DEFAULT closemessage - applymovement LOCALID_WOMAN_2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_WOMAN_2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -812,7 +794,7 @@ SootopolisCity_EventScript_Woman1:: SootopolisCity_EventScript_Woman1Legendaries:: msgbox SootopolisCity_Text_GiganticPokemonFight, MSGBOX_DEFAULT closemessage - applymovement LOCALID_WOMAN_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_WOMAN_1, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -829,14 +811,14 @@ SootopolisCity_EventScript_Woman1Rayquaza:: SootopolisCity_EventScript_NinjaBoy:: lockall - applymovement LOCALID_NINJA_BOY, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_NINJA_BOY, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_NinjaBoyRayquaza goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_NinjaBoyNormal goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_NinjaBoyNormal msgbox SootopolisCity_Text_ThisIsWicked, MSGBOX_DEFAULT closemessage - applymovement LOCALID_NINJA_BOY, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_NINJA_BOY, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -853,7 +835,7 @@ SootopolisCity_EventScript_NinjaBoyRayquaza:: SootopolisCity_EventScript_Boy1:: lockall - applymovement LOCALID_BOY_1, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_BOY_1, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Boy1Rayquaza goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_Boy1GameClear @@ -861,7 +843,7 @@ SootopolisCity_EventScript_Boy1:: goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_Boy1Normal msgbox SootopolisCity_Text_GiantPokemonSuddenlyAppeared, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BOY_1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_BOY_1, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -895,7 +877,7 @@ EventScript_ClosedSootopolisDoor:: SootopolisCity_EventScript_Steven:: lockall - applymovement LOCALID_STEVEN, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_STEVEN, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_StevenHelpWallace @@ -928,13 +910,13 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: call_if_eq VAR_FACING, DIR_NORTH, SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT closemessage - applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenWalkToCaveOfOrigin + applymovement LOCALID_SOOTOPOLIS_STEVEN, SootopolisCity_Movement_StevenWalkToCaveOfOrigin applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin waitmovement 0 delay 120 - applymovement LOCALID_EXPERT, SootopolisCity_Movement_ExpertMoveAside + applymovement LOCALID_SOOTOPOLIS_EXPERT, SootopolisCity_Movement_ExpertMoveAside waitmovement 0 - applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenArriveCaveEntrance + applymovement LOCALID_SOOTOPOLIS_STEVEN, SootopolisCity_Movement_StevenArriveCaveEntrance applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance waitmovement 0 msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT @@ -947,13 +929,13 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: end SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: - applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin + applymovement LOCALID_SOOTOPOLIS_STEVEN, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest waitmovement 0 return SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: - applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin + applymovement LOCALID_SOOTOPOLIS_STEVEN, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth waitmovement 0 return @@ -1224,12 +1206,12 @@ SootopolisCity_Movement_PlayerEnterCaveOfOrigin: SootopolisCity_EventScript_Boy2:: lockall - applymovement LOCALID_BOY_2, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_BOY_2, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Boy2Rayquaza msgbox SootopolisCity_Text_TwoPokemonArentAngry, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BOY_2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_BOY_2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1245,17 +1227,17 @@ SootopolisCity_EventScript_BlackBelt:: goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_BlackBeltRayquaza msgbox SootopolisCity_Text_GoRedAndBlueMon, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BLACK_BELT, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_DoYouKnowMonNames, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BLACK_BELT, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SootopolisCity_EventScript_BlackBeltRayquaza:: - applymovement LOCALID_BLACK_BELT, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_GreenOneSettlesThings, MSGBOX_DEFAULT releaseall @@ -1263,12 +1245,12 @@ SootopolisCity_EventScript_BlackBeltRayquaza:: SootopolisCity_EventScript_Girl:: lockall - applymovement LOCALID_GIRL, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_GIRL, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_GirlRayquaza msgbox SootopolisCity_Text_SootopolisWillBeWrecked, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GIRL, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_GIRL, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1281,12 +1263,12 @@ SootopolisCity_EventScript_GirlRayquaza:: SootopolisCity_EventScript_Maniac:: lockall - applymovement LOCALID_MANIAC, Common_Movement_FacePlayer + applymovement LOCALID_SOOTOPOLIS_MANIAC, Common_Movement_FacePlayer waitmovement 0 goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_ManiacRayquaza msgbox SootopolisCity_Text_SeeingLegendWithOwnEyes, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MANIAC, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SOOTOPOLIS_MANIAC, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1319,16 +1301,16 @@ SootopolisCity_EventScript_GiveWaterfall:: end SootopolisCity_EventScript_WallaceMoveFromGym:: - applymovement LOCALID_WALLACE, SootopolisCity_Movement_WallaceMoveFromGym + applymovement LOCALID_SOOTOPOLIS_WALLACE, SootopolisCity_Movement_WallaceMoveFromGym waitmovement 0 - copyobjectxytoperm LOCALID_WALLACE + copyobjectxytoperm LOCALID_SOOTOPOLIS_WALLACE setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1 return SootopolisCity_EventScript_WallaceMoveFromGymWest:: - applymovement LOCALID_WALLACE, SootopolisCity_Movement_WallaceMoveFromGymWest + applymovement LOCALID_SOOTOPOLIS_WALLACE, SootopolisCity_Movement_WallaceMoveFromGymWest waitmovement 0 - copyobjectxytoperm LOCALID_WALLACE + copyobjectxytoperm LOCALID_SOOTOPOLIS_WALLACE setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2 return diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 0b2ad974c0fa..f9307a231bd6 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MYSTERY_EVENTS_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 6, "y": 4, diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 374adbfc66ad..2df40a518877 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_OLD_MAN, 1 - SootopolisCity_MysteryEventsHouse_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_OnFrame @@ -13,14 +11,14 @@ SootopolisCity_MysteryEventsHouse_1F_OnTransition: SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout:: setvar VAR_TEMP_1, 1 - setobjectxyperm LOCALID_OLD_MAN, 3, 2 - setobjectmovementtype LOCALID_OLD_MAN, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_MYSTERY_EVENTS_OLD_MAN, 3, 2 + setobjectmovementtype LOCALID_MYSTERY_EVENTS_OLD_MAN, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED return SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor:: - setobjectxyperm LOCALID_OLD_MAN, 2, 2 - setobjectmovementtype LOCALID_OLD_MAN, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_MYSTERY_EVENTS_OLD_MAN, 2, 2 + setobjectmovementtype LOCALID_MYSTERY_EVENTS_OLD_MAN, MOVEMENT_TYPE_FACE_RIGHT return SootopolisCity_MysteryEventsHouse_1F_OnFrame: @@ -33,9 +31,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: lockall applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs waitmovement 0 - applymovement LOCALID_OLD_MAN, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer + applymovement LOCALID_MYSTERY_EVENTS_OLD_MAN, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer waitmovement 0 - copyobjectxytoperm LOCALID_OLD_MAN + copyobjectxytoperm LOCALID_MYSTERY_EVENTS_OLD_MAN applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call_if_eq VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 0fa27599da31..8db695278d37 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SOOTOPOLIS_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index e1e13b35c830..757c9063e46f 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NURSE, 1 - SootopolisCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -10,7 +8,7 @@ SootopolisCity_PokemonCenter_1F_OnTransition: end SootopolisCity_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_SOOTOPOLIS_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 6912e3f4bda6..d7cdb1238a89 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SOUTHERN_ISLAND_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 23, @@ -28,6 +29,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOUTHERN_ISLAND_SS_TIDAL", "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 25, diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 6e7009a1f295..c5c6ad2d8015 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_SAILOR, 1 -.set LOCALID_SS_TIDAL, 2 - SouthernIsland_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_OnTransition .byte 0 @@ -19,8 +16,8 @@ SouthernIsland_Exterior_EventScript_Sailor:: applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 30 - hideobjectat LOCALID_SAILOR, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar VAR_0x8004, LOCALID_SS_TIDAL + hideobjectat LOCALID_SOUTHERN_ISLAND_SAILOR, MAP_SOUTHERN_ISLAND_EXTERIOR + setvar VAR_0x8004, LOCALID_SOUTHERN_ISLAND_SS_TIDAL call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 8, 11 waitstate diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 76212cbbd15e..6871b7704fbf 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -28,6 +28,7 @@ "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" }, { + "local_id": "LOCALID_SOUTHERN_ISLAND_LATI", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 2, diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 8486739d93dc..749bfb254922 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LATI, 2 - SouthernIsland_Interior_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition @@ -12,7 +10,7 @@ SouthernIsland_Interior_OnResume: SouthernIsland_Interior_EventScript_TryRemoveLati:: specialvar VAR_RESULT, GetBattleOutcome goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn - removeobject LOCALID_LATI + removeobject LOCALID_SOUTHERN_ISLAND_LATI return SouthernIsland_Interior_OnTransition: @@ -66,14 +64,14 @@ SouthernIsland_Interior_EventScript_Lati:: playmoncry VAR_TEMP_4, CRY_MODE_NORMAL delay 30 waitmoncry - addobject LOCALID_LATI + addobject LOCALID_SOUTHERN_ISLAND_LATI delay 30 applymovement OBJ_EVENT_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown - applymovement LOCALID_LATI, SouthernIsland_Interior_Movement_LatiApproach + applymovement LOCALID_SOUTHERN_ISLAND_LATI, SouthernIsland_Interior_Movement_LatiApproach waitmovement 0 delay 50 special RemoveCameraObject - setvar VAR_LAST_TALKED, LOCALID_LATI + setvar VAR_LAST_TALKED, LOCALID_SOUTHERN_ISLAND_LATI call_if_eq VAR_ROAMER_POKEMON, 0, SouthernIsland_Interior_EventScript_SetLatiosBattleVars call_if_ne VAR_ROAMER_POKEMON, 0, SouthernIsland_Interior_EventScript_SetLatiasBattleVars setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index a611cbf64145..c24a06363328 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 6, diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index bec1ffbff1c9..49483d8150d3 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_ATTENDANT, 1 - TrainerHill_Elevator_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_OnFrame .byte 0 @@ -22,13 +20,13 @@ TrainerHill_Elevator_EventScript_ExitToRoof:: TrainerHill_Elevator_EventScript_EnterElevator:: applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant waitmovement 0 - applymovement LOCALID_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFacePlayer + applymovement LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFacePlayer waitmovement 0 lockall msgbox TrainerHill_Elevator_Text_ReturnToReception, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, TrainerHill_Elevator_EventScript_ExitToRoof releaseall - applymovement LOCALID_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFaceDown + applymovement LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFaceDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator waitmovement 0 diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index c8395b10c070..60e9d1b9be5a 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -39,6 +39,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VERDANTURF_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 9, "y": 2, diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 133fd62865d2..1e115e676275 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_TWIN, 2 - VerdanturfTown_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_OnTransition .byte 0 @@ -14,14 +12,14 @@ VerdanturfTown_EventScript_Twin:: faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen msgbox VerdanturfTown_Text_ManTryingToDigTunnel, MSGBOX_DEFAULT - applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VERDANTURF_TWIN, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_TwinTunnelOpen:: msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT - applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VERDANTURF_TWIN, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 20a144afb969..4bae6ce2f45c 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -15,6 +15,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VERDANTURF_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 5fbdba42f42a..2531a7501b25 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NURSE, 1 - VerdanturfTown_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -11,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_OnTransition: end VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: - setvar VAR_0x800B, LOCALID_NURSE + setvar VAR_0x800B, LOCALID_VERDANTURF_NURSE call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress diff --git a/src/field_specials.c b/src/field_specials.c index 5d52e5542e52..f5abeb8bc1a0 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3600,7 +3600,7 @@ u32 GetMartEmployeeObjectEventId(void) { MAP_GROUP(MAP_FORTREE_CITY_MART), MAP_NUM(MAP_FORTREE_CITY_MART), LOCALID_FORTREE_MART_CLERK }, { MAP_GROUP(MAP_MOSSDEEP_CITY_MART), MAP_NUM(MAP_MOSSDEEP_CITY_MART), LOCALID_MOSSDEEP_MART_CLERK }, { MAP_GROUP(MAP_SOOTOPOLIS_CITY_MART), MAP_NUM(MAP_SOOTOPOLIS_CITY_MART), LOCALID_SOOTOPOLIS_MART_CLERK }, - { MAP_GROUP(MAP_BATTLE_FRONTIER_MART), MAP_NUM(MAP_BATTLE_FRONTIER_MART), LOCALID_BATTLE_FRONTIER_MART_CLERK } + { MAP_GROUP(MAP_BATTLE_FRONTIER_MART), MAP_NUM(MAP_BATTLE_FRONTIER_MART), LOCALID_FRONTIER_MART_CLERK }, }; u8 i;