dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Continue adding local IDs to map.json files

Browse Source
This commit is contained in:
GriffinR
2024-10-12 09:59:56 -04:00
parent a2a3255bdd
commit cb66ea6653
169 changed files with 1233 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LilycoveCity_Harbor/map.json
+4
View File
@@ -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,
data/maps/LilycoveCity_Harbor/scripts.inc
+25 -30
View File
@@ -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