dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*actual* final pass at unifying on object event

Browse Source
This commit is contained in:
garak
2019-12-17 21:09:15 -05:00
parent fabe354c01
commit 8ee35bc615
377 changed files with 1967 additions and 5531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/ViridianCity/map.json
+9 -9
View File
@@ -30,7 +30,7 @@
],
"object_events": [
{
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 8,
"y": 26,
"elevation": 3,
@@ -43,7 +43,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 11,
"y": 24,
"elevation": 3,
@@ -56,7 +56,7 @@
"flag": "FLAG_TEMP_11"
},
{
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 34,
"y": 11,
"elevation": 3,
@@ -69,7 +69,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_VAR_0",
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 21,
"y": 6,
"elevation": 3,
@@ -82,7 +82,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_WOMAN_3",
"graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 20,
"y": 12,
"elevation": 3,
@@ -95,7 +95,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 33,
"y": 26,
"elevation": 3,
@@ -108,7 +108,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_BOY",
"graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 16,
"y": 22,
"elevation": 3,
@@ -121,7 +121,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 18,
"y": 5,
"elevation": 3,
@@ -134,7 +134,7 @@
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 5,
"elevation": 3,
data/maps/ViridianCity/scripts.inc
+3 -3
View File
@@ -15,17 +15,17 @@ ViridianCity_MapScript1_1658D9:: @ 81658D9
end
EventScript_165909:: @ 8165909
setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
return
EventScript_16590F:: @ 816590F
setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
setobjectxyperm 4, 21, 8
setobjectmovementtype 4, 1
return
EventScript_165920:: @ 8165920
setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_VIRIDIAN_DRUNK
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK
setobjectxyperm 4, 21, 11
setobjectmovementtype 4, 8
return