Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-04-24 23:07:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split connection field from graphics id in object events

Browse Source
This commit is contained in:
GriffinR 2020-02-18 18:13:31 -05:00
parent f9c1b61014
commit 2a2db28e57
11 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asm/macros/map.inc
View File

@ -14,9 +14,10 @@
.4byte \address
.endm
.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.macro object_event index:req, gfx:req, in_connection:req x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index
.2byte \gfx
.byte \gfx
.byte \in_connection
.byte 0
.2byte \x, \y
.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0

5
data/maps/CeladonCity/map.json
View File

@ -183,8 +183,9 @@
"flag": "0"
},
{
"graphics_id": "65375",
"x": 65529,
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255,
"x": -7,
"y": 21,
"elevation": 7,
"movement_type": "MOVEMENT_TYPE_NONE",

3
data/maps/CeruleanCity/map.json
View File

@ -154,7 +154,8 @@
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "65375",
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255,
"x": 50,
"y": 18,
"elevation": 10,

3
data/maps/FiveIsland/map.json
View File

@ -53,7 +53,8 @@
"flag": "0"
},
{
"graphics_id": "65375",
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255,
"x": 32,
"y": 9,
"elevation": 4,

3
data/maps/Route15/map.json
View File

@ -196,7 +196,8 @@
"flag": "0"
},
{
"graphics_id": "65375",
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255,
"x": 73,
"y": 7,
"elevation": 13,

3
data/maps/Route2/map.json
View File

@ -105,7 +105,8 @@
"flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL"
},
{
"graphics_id": "65375",
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255,
"x": 6,
"y": 85,
"elevation": 8,

5
data/maps/Route21_North/map.json
View File

@ -92,9 +92,10 @@
"flag": "0"
},
{
"graphics_id": "65307",
"graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"in_connection": 255,
"x": 13,
"y": 65533,
"y": -3,
"elevation": 2,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,

3
data/maps/Route4/map.json
View File

@ -105,7 +105,8 @@
"flag": "0"
},
{
"graphics_id": "65321",
"graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"in_connection": 255,
"x": 109,
"y": 3,
"elevation": 12,

5
data/maps/Route7/map.json
View File

@ -27,8 +27,9 @@
],
"object_events": [
{
"graphics_id": "65375",
"x": 65528,
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255,
"x": -8,
"y": 12,
"elevation": 10,
"movement_type": "MOVEMENT_TYPE_NONE",

5
data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
View File

@ -105,9 +105,10 @@
"flag": "0"
},
{
"graphics_id": "65321",
"graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"in_connection": 255,
"x": 7,
"y": 65534,
"y": -2,
"elevation": 1,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,

1
tools/mapjson/mapjson.cpp
View File

@ -274,6 +274,7 @@ string generate_firered_map_events_text(Json map_data) {
auto obj_event = map_data["object_events"].array_items()[i];
text << "\tobject_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", "
<< obj_event["in_connection"].int_value() << ", "
<< obj_event["x"].int_value() << ", "
<< obj_event["y"].int_value() << ", "
<< obj_event["elevation"].int_value() << ", "