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

6
data/maps/MossdeepCity/map.json
View File

@@ -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,

43
data/maps/MossdeepCity/scripts.inc
View File

@@ -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