diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-19 15:05:51 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-19 15:05:51 -0400 |
| commit | d98d4d887c16e8fa13360e3f243bf019844d3c41 (patch) | |
| tree | 729ebda526ec73161b3a1a85547a80b157d598e1 | |
| parent | 1449c71364c65e30be434923ef6b89836bdaafa6 (diff) | |
Set map.json files with map_obj_gfx constants
366 files changed, 1690 insertions, 1678 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index bf3ff24fc..7a91fc01e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,6 +12,7 @@ #include "constants/spawn_points.h" #include "constants/field_effects.h" #include "constants/trainers.h" +#include "constants/map_objects.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -59,8 +60,6 @@ gStdScripts:: @ 8160450 .4byte gStdScript_ItemMessageAndFanfare gStdScriptsEnd:: - - .include "data/maps/UnknownMap_00_00/scripts.inc" .include "data/maps/UnknownMap_00_01/scripts.inc" .include "data/maps/UnknownMap_00_02/scripts.inc" @@ -485,8 +484,6 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/scripts.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/scripts.inc" - - .include "data/maps/ViridianForest/text.inc" .include "data/maps/MtMoon_1F/text.inc" .include "data/maps/MtMoon_B2F/text.inc" @@ -772,8 +769,6 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/text.inc" - - gStdScript_2:: @ 81A4E3F lock faceplayer @@ -1494,7 +1489,6 @@ Text_1A644F:: @ 81A644F .string "This move can be learned only\n" .string "once. Is that okay?$" - EventScript_ResetAllMapFlags:: @ 81A6481 setflag FLAG_0x02B setflag FLAG_0x02C diff --git a/data/map_events.s b/data/map_events.s index 583802155..a36cd149f 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -10,6 +10,7 @@ #include "constants/vars.h" #include "constants/weather.h" @#include "constants/trainer_hill.h" +#include "constants/map_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 5ee37131f..0d81cfa6c 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "106", + "graphics_id": "MAP_OBJ_GFX_METEORITE", "x": 15, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "154" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 15, "y": 3, "elevation": 3, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 8b67539ce..b53955f53 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,8 +10,8 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213 BirthIsland_Exterior_MapScript1_165217:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR - setvar VAR_0x4010, 150 - setvar VAR_SECRET_BASE_MAP, 0 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N + setvar VAR_0x4026, 0 setvar VAR_0x403E, 0 checkflag FLAG_0x2E4 call_if 1, EventScript_16523C diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index cecda6ec5..eed07d984 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 890ae2da0..136e04982 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 48, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "95" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 38, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "112", + "graphics_id": "MAP_OBJ_GFX_POLIWRATH", "x": 36, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 11, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 18, "y": 22, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 30, "y": 24, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 26, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 38, "y": 31, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "95" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 9, "y": 30, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 52, "y": 22, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "20" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 40, "y": 35, "elevation": 0, @@ -168,7 +168,7 @@ "flag": "19" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 25, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "465" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index cb315ade8..eed6a38a6 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "125", + "graphics_id": "MAP_OBJ_GFX_MEOWTH", "x": 1, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "113", + "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", "x": 5, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "122", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", "x": 5, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 2, "y": 9, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index e460de793..3541660d4 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 6, "y": 6, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "158" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 5, "y": 6, "elevation": 0, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 4a405c3f1..41561f349 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 0, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 4, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 0, "y": 13, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index aee589439..14c5e6d98 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 412eb4008..f40f5c2fe 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 6, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 42d5c76f5..0f01dd4cd 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 5, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 8, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 11, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 21780d544..3ac411820 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 10, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 4, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 1, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 9, "y": 14, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 8598fbae4..e68119e01 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 6, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 10, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 3, "y": 13, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 12e86270d..2c30cb8b5 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 6, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index fc4f32491..1d499c195 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 9, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 3c13bc40f..3a1f161e2 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 4, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 7, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 10, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 16, "y": 10, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index d4085c047..658ec5bd4 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 6, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 15647d28f..690cf2d47 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 10, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 2, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 5, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 7, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "83", + "graphics_id": "MAP_OBJ_GFX_ERIKA", "x": 6, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 8, "y": 7, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 6, "y": 8, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 3, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 0bb559faf..4d1d99203 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 3, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 40d610292..ea37835d1 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 57eee5a1d..c29be0604 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 10, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index faa029c1f..6db3c2c2a 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 1abb5c5ae..1e96149ad 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 12, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 11, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 6eb159ec0..bc61b6f2a 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "434" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "435" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 25, "y": 5, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "433" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 18, "elevation": 3, diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 73fd1877f..4afc6c445 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "437" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 29, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "438" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 33, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "436" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "23" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "24" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "25" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "26" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 20, "elevation": 3, diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 8ad1ef685..0954f895e 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 31, "y": 9, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "440" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 32, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "439" }, { - "graphics_id": "139", + "graphics_id": "MAP_OBJ_GFX_MEWTWO", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "129" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "23" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "24" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "25" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 4b7ab2444..a51b06518 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -35,7 +35,7 @@ ], "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 31, "y": 12, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 33, "y": 6, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "59" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 16, "y": 21, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 9, "y": 23, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "129", + "graphics_id": "MAP_OBJ_GFX_SLOWBRO", "x": 32, "y": 29, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 33, "y": 29, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 34, "y": 22, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 22, "y": 0, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "60" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 26, "y": 32, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 12, "y": 30, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 1, "y": 13, "elevation": 3, diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 0f56bc949..34b8b351a 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 9, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index ad41f1e70..6cf69cf3e 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "81", + "graphics_id": "MAP_OBJ_GFX_MISTY", "x": 8, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 16, "elevation": 3, diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 51f0db0ca..9326a9234 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 6865c93a0..44fcd2b45 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 829ae2084..c1ce74bf3 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index ee56f7d91..13ef69f13 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 489ae791f..9feb1ced4 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index e29ff56dd..182e8ccf6 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 9, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index f80669fac..be49ee0b6 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 5, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 228bfa8a3..1780cc18f 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 5e2726a36..b70cb19c9 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 14, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 11, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 20, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "98" }, { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 23, "y": 7, "elevation": 1, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 83cc3ffc0..f442fb26a 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 25, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 25, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 17, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 16, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 4, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "86", + "graphics_id": "MAP_OBJ_GFX_BLAINE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 24, "y": 20, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 1d40fc33d..59430b7ed 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index e14c68123..406880956 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "157" }, { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 258320b9b..b7778f77b 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 4c0d5d33a..1e35330d9 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index c0bd22e9d..a942a9ca8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 11, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 12, "y": 3, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index a7af3e0c9..6542e543c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 42fc53a4c..0402b218a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 1ee6434d7..ac1360466 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index c62cc1258..9b1a1ce89 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 5dd4a4ac4..ecb5fb9d9 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 8, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 16, "y": 10, "elevation": 3, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 835b1ef31..d1220b637 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 45ac73f0f..00af7faf1 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index d9b1ca36e..b7e3229c8 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 46a9371be..05d20f0d4 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index af59dbf68..3de72549a 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "147" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 1bb718599..b6c7eee6a 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 19a4d07fb..81d5c84a6 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 12c0a2295..34c5d1c2e 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 0d5204697..61b7c7707 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index da9555287..5a6782d59 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 2d374bd56..79492a3ef 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "50", + "graphics_id": "MAP_OBJ_GFX_ROCKET_F", "x": 18, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "136" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 17, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "136" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 11, "y": 27, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "136" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 8, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 19, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "19" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "478" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 22, "elevation": 3, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index c95148359..fcb4710ef 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 8, "y": 44, "elevation": 4, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 12, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 14, "y": 17, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 17, "y": 31, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 47, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index af0f12fde..b89d73b1b 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 4, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index d1c083cb7..5c59463ff 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 393beb511..a33858daf 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 44, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 33, "y": 12, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 12, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 23, "y": 9, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 33, "y": 3, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, "elevation": 1, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 39, "y": 9, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 60c8196d3..68c9ce418 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "149" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index a2ef1dd10..5191f32d2 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 15, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "136" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 17, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "136" }, { - "graphics_id": "50", + "graphics_id": "MAP_OBJ_GFX_ROCKET_F", "x": 27, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "136" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 25, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "136" }, { - "graphics_id": "50", + "graphics_id": "MAP_OBJ_GFX_ROCKET_F", "x": 6, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "136" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 27, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 25, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "500" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 3, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "501" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 16, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "502" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 173c247da..e9f0eb16a 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 6dc00bca6..26cc2645b 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "132", + "graphics_id": "MAP_OBJ_GFX_DODUO", "x": 12, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "122", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", "x": 13, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "123", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", "x": 14, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "121", + "graphics_id": "MAP_OBJ_GFX_PSYDUCK", "x": 17, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 26, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "18" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 6, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "473" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 32, "y": 19, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "474" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 8, "y": 25, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "151" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 36, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 31, "y": 21, "elevation": 3, diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index e7507d3fe..5b550da70 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index a33509d0c..c47859aff 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 8, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index bfb59deeb..a11437ab1 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 9a9bb955a..cdff7efeb 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "496" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 16, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 709b24259..ab812373b 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "498" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index b47ef6927..6582bf948 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 11, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "141" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 13, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "141" }, { - "graphics_id": "77", + "graphics_id": "MAP_OBJ_GFX_LORELEI", "x": 12, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "139" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 45784f529..b60903dd4 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "77", + "graphics_id": "MAP_OBJ_GFX_LORELEI", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "140" }, { - "graphics_id": "131", + "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", "x": 0, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "126", + "graphics_id": "MAP_OBJ_GFX_SEEL", "x": 10, "y": 3, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "120", + "graphics_id": "MAP_OBJ_GFX_PIKACHU", "x": 9, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "128", + "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", "x": 7, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "129", + "graphics_id": "MAP_OBJ_GFX_SLOWBRO", "x": 6, "y": 2, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "121", + "graphics_id": "MAP_OBJ_GFX_PSYDUCK", "x": 6, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "125", + "graphics_id": "MAP_OBJ_GFX_MEOWTH", "x": 9, "y": 4, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "165" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 10, "y": 4, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "166" }, { - "graphics_id": "115", + "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", "x": 0, "y": 3, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "168" }, { - "graphics_id": "122", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", "x": 0, "y": 5, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "167" }, { - "graphics_id": "123", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", "x": 1, "y": 5, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "169" }, { - "graphics_id": "114", + "graphics_id": "MAP_OBJ_GFX_PIDGEOT", "x": 9, "y": 0, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "171" }, { - "graphics_id": "133", + "graphics_id": "MAP_OBJ_GFX_FEAROW", "x": 10, "y": 0, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "170" }, { - "graphics_id": "107", + "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index ca5cba0ec..5b9164382 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 6, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 8, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 45d65222d..f6db941e8 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 10, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index a118bf9bb..7d06d9822 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 812097722..be2f8dc9d 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index a2957b9d9..874f2159b 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 37, "y": 17, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "128", + "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", "x": 36, "y": 15, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "127", + "graphics_id": "MAP_OBJ_GFX_VOLTORB", "x": 33, "y": 8, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 33, "y": 11, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 39, "y": 8, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 14, "y": 15, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "135", + "graphics_id": "MAP_OBJ_GFX_LAPRAS", "x": 12, "y": 20, "elevation": 1, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 36, "y": 20, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 8, "y": 8, "elevation": 1, @@ -147,7 +147,7 @@ "flag": "0" }, { - "graphics_id": "119", + "graphics_id": "MAP_OBJ_GFX_KANGASKHAN", "x": 16, "y": 9, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 10, "elevation": 3, @@ -173,7 +173,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 21, "y": 13, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 32, "y": 16, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "20" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 24, "y": 22, "elevation": 3, @@ -212,7 +212,7 @@ "flag": "21" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 15, "y": 11, "elevation": 3, @@ -225,7 +225,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 40, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 9fefb3d86..9bd21df92 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -11,11 +11,11 @@ FuchsiaCity_MapScript1_166D7B:: @ 8166D7B end EventScript_166D91:: @ 8166D91 - setvar VAR_0x4010, 118 + setvar VAR_OBJ_GFX_ID_0, 118 return EventScript_166D97:: @ 8166D97 - setvar VAR_0x4010, 147 + setvar VAR_OBJ_GFX_ID_0, 147 return FuchsiaCity_EventScript_166D9D:: @ 8166D9D diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 2d567eaaf..838a6c0ab 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "441" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 4, "y": 1, "elevation": 0, diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index ff7e432c2..4ee96a265 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 12, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 2, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 11, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 13, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 2, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "84", + "graphics_id": "MAP_OBJ_GFX_KOGA", "x": 7, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 7f6e645b4..a0b11d62e 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 1, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 5aeaa2b32..2f57e17fb 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 2267848fc..4e47edc91 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index fcdd61d33..d8da727b1 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 4b711686d..6246ddfb2 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 6b0547ad4..0f4c1c456 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index bbfc3846f..d0451f0aa 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 39114ccdb..42e36142c 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 12, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 90973993a..d10117c39 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 11, "y": 6, "elevation": 0, @@ -33,7 +33,7 @@ "flag": "163" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 11, "y": 6, "elevation": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 3d9919ed1..012378da2 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 0, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 13, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 5, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 23, "y": 13, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 22, "y": 9, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "157" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 16, "y": 15, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 23, "y": 9, "elevation": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 646c4d178..a730db362 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index a7c2dcd10..ff8bd94a4 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 19, "y": 10, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 12, "y": 12, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 10, "y": 7, "elevation": 3, diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index d733b6630..8cd810223 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "111", + "graphics_id": "MAP_OBJ_GFX_CUBONE", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index aa17b7d39..5d754bc7c 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index b944ac24e..fab6c58ac 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 9, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 4ef87ccf2..2020bf5fe 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 5, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 2, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 31112697f..923796037 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 7a917e264..25f7e849f 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "78", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_3", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "53" }, { - "graphics_id": "124", + "graphics_id": "MAP_OBJ_GFX_NIDORINO", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "121", + "graphics_id": "MAP_OBJ_GFX_PSYDUCK", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 9, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 3, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 16b7844dd..fa5fb2e2d 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 29, "y": 45, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 41, "y": 40, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "137" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 42, "y": 40, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "137" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 22, "y": 35, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 15, "y": 28, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 14, "y": 42, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "19" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "21" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 35, "y": 17, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "23" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 6, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "493" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 38, "y": 10, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "494" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 48, "y": 20, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index af7c2032f..acf62c06f 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 3a95580b2..16207a3b3 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 14, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 78149246d..205387b0a 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index e296e9318..23465b7aa 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 42576cb8d..196b31152 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 5bc2edf77..4318d5b87 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "23" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 637afcde5..b5c72fefb 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "99", + "graphics_id": "MAP_OBJ_GFX_RUBY", "x": 7, "y": 7, "elevation": 0, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 34eb9d6a7..25635fa61 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "137", + "graphics_id": "MAP_OBJ_GFX_MOLTRES", "x": 9, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "82" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 62da287fd..f376b7bcc 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "23" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "24" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "25" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 26, "elevation": 3, diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 135f731fc..ec9135155 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 20, "y": 26, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 36, "y": 30, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 30, "y": 35, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 33, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 7, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 13, "y": 17, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 7, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 22, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "345" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 35, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "346" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "347" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 42, "y": 35, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "348" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 44, "y": 21, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "349" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "350" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 42, "y": 7, "elevation": 3, diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index ebdf28deb..d78f3a942 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "98", + "graphics_id": "MAP_OBJ_GFX_FOSSIL", "x": 13, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "47" }, { - "graphics_id": "98", + "graphics_id": "MAP_OBJ_GFX_FOSSIL", "x": 14, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "48" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 13, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 37, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 12, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 35, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 18, "y": 27, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "173" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 26, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "351" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 35, "y": 5, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "352" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "447" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index aa97091ec..e088f779a 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "144", + "graphics_id": "MAP_OBJ_GFX_LUGIA", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index dee041a54..cdbf54da8 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 609e24de6..a8bba827c 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "145", + "graphics_id": "MAP_OBJ_GFX_HO_OH", "x": 9, "y": 6, "elevation": 0, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 0bd30ba71..a495cc5a5 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "113" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 13, "y": 9, "elevation": 3, diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 6a8cbe4b2..861731295 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 7367836f7..216436861 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index d88b79750..06f7031e1 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 74023f6d0..3ea281a61 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "46", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "45", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 15, "y": 25, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 16, "y": 64, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 64, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 11, "y": 89, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 9, "y": 108, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 8, "y": 68, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 9, "y": 68, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, "elevation": 3, @@ -202,7 +202,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, "elevation": 3, @@ -215,7 +215,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, "elevation": 3, @@ -228,7 +228,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, "elevation": 3, @@ -241,7 +241,7 @@ "flag": "23" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, "elevation": 3, @@ -254,7 +254,7 @@ "flag": "24" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, "elevation": 3, @@ -267,7 +267,7 @@ "flag": "25" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, "elevation": 3, @@ -280,7 +280,7 @@ "flag": "26" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, "elevation": 3, @@ -293,7 +293,7 @@ "flag": "27" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, "elevation": 3, @@ -306,7 +306,7 @@ "flag": "28" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, "elevation": 4, @@ -319,7 +319,7 @@ "flag": "29" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, "elevation": 3, @@ -332,7 +332,7 @@ "flag": "30" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, "elevation": 3, @@ -345,7 +345,7 @@ "flag": "31" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, "elevation": 4, @@ -358,7 +358,7 @@ "flag": "17" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 15, "y": 70, "elevation": 3, @@ -371,7 +371,7 @@ "flag": "475" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 103, "elevation": 3, @@ -384,7 +384,7 @@ "flag": "476" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 114, "elevation": 4, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 71bbbe0dd..d081340e8 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 11, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 15, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 6, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "157" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 20, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 10, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 11, "y": 20, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 4c6527a0a..7e9257071 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "114" }, { - "graphics_id": "89", + "graphics_id": "MAP_OBJ_GFX_CELIO", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "115" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 6, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 3, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 616c96a7c..e407f61d3 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index fb2be2761..8ab73a6e3 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 13, "y": 20, "elevation": 3, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index b47575c42..10e4cc83c 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 3, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 13, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index c5522db0b..b63fc575a 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "76", + "graphics_id": "MAP_OBJ_GFX_DAISY", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "93", + "graphics_id": "MAP_OBJ_GFX_TOWN_MAP", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index ad29c0e04..4e281c43a 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "88", + "graphics_id": "MAP_OBJ_GFX_MOM", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index c7440708c..494906574 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 2, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 11, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 6, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "43" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 4, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "40" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "41" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 10, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "42" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "45" }, { - "graphics_id": "94", + "graphics_id": "MAP_OBJ_GFX_POKEDEX", "x": 4, "y": 1, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "58" }, { - "graphics_id": "94", + "graphics_id": "MAP_OBJ_GFX_POKEDEX", "x": 5, "y": 1, "elevation": 0, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 999d31f1e..e8fb9dbf0 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 6, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 33, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "80" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 21, "y": 28, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 33, "y": 27, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 42, "y": 20, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "46" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "18" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 46, "y": 20, "elevation": 3, diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 5893d6954..16d0992be 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "80", + "graphics_id": "MAP_OBJ_GFX_BROCK", "x": 6, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 12, "elevation": 3, diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index d44ec63bf..5f177362a 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "123", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 83aaf23bf..83699d95f 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 8b9c5e575..08555943c 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 8, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 6, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 0f545ce75..3414e91fd 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 21, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "101", + "graphics_id": "MAP_OBJ_GFX_OLD_AMBER", "x": 22, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "86" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 26, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 26, "y": 7, "elevation": 3, diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 317926b39..069f33249 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 10, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 0, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 15, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 16, "y": 8, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 6807511b1..a4a4bee9f 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "115", + "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 1, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 13, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 10, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 37dd74cef..3e4536016 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 16b98cfda..30d6cc36c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "75", + "graphics_id": "MAP_OBJ_GFX_AGATHA", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 05cc19dbe..b3ff9a6e6 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "79", + "graphics_id": "MAP_OBJ_GFX_BRUNO", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 90e243652..a0398c3f5 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 6, "y": 15, "elevation": 0, diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index a2146d74b..cacd686ab 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 1d962ccba..0a995986e 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "74", + "graphics_id": "MAP_OBJ_GFX_LANCE", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 6435fd40f..1a8512901 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "77", + "graphics_id": "MAP_OBJ_GFX_LORELEI", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index addd0fcd0..d6850e960 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 22, "y": 24, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 29, "y": 32, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "415" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "416" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "458" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 6a85dbb1e..a23d361b7 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 5, "y": 23, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 36, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "417" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 23, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "459" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 35, "y": 17, "elevation": 3, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 64710eea8..a47dbd546 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 22, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "418" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 32, "y": 6, "elevation": 3, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 27340dcc6..ff1468f6a 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 21, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "423" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 20, "y": 25, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 34, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 23, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "420" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 29, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "421" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index ad49dce83..5185ebec7 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 18, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 18, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 7, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 8, "y": 12, "elevation": 3, diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 9b23a2904..ac910fa70 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "81" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index dcba6c23f..5035b861f 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 9, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 12, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index b567872bf..c5fd2c6ef 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 17, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 15, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "376" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "377" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index f48ae30b6..d2d4ad16f 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 19, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 12, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "379" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 9, "elevation": 3, diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index f97249088..225dac857 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 13, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 18, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "380" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 2ba2a85b6..d1d2e8f61 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "78", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_3", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "52" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "94" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 13, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "131" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 5af4df25f..59cac8021 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 27, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "410" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 40, "y": 22, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "411" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 46, "y": 37, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "412" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 45, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "413" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 26, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "414" }, { - "graphics_id": "136", + "graphics_id": "MAP_OBJ_GFX_ZAPDOS", "x": 5, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "93" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 36, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "134" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 38, "elevation": 3, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 59abc79f0..29f5d11de 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 26, "y": 28, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 39, "y": 27, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 45, "y": 24, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 7, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 27, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 37, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "451" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 33, "y": 22, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "452" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 22, "elevation": 3, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 0d2d1696e..c4e1b42ce 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 11, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 36, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 41, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 23, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 15, "y": 33, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 29, "y": 35, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 2, "y": 29, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 37, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "454" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 2, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "455" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "23" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "24" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "25" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, "elevation": 3, @@ -274,7 +274,7 @@ "flag": "26" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, "elevation": 3, @@ -287,7 +287,7 @@ "flag": "27" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, "elevation": 3, @@ -300,7 +300,7 @@ "flag": "28" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, "elevation": 3, @@ -313,7 +313,7 @@ "flag": "29" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, "elevation": 3, @@ -326,7 +326,7 @@ "flag": "30" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, "elevation": 3, @@ -339,7 +339,7 @@ "flag": "31" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 6, "elevation": 3, diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 8c12e4836..4f970c68d 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 24, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 6, "y": 32, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 22, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 21, "y": 27, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "173" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 16, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "364" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 22, "elevation": 3, diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index eff2b29af..4be94d6af 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 20, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "173" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 15, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "366" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "367" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "368" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 0, "y": 14, "elevation": 3, diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index c76019248..a67f9c37e 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 19, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 2, "y": 20, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "173" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "370" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 19, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "371" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 14, "y": 24, "elevation": 3, diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 913e51a57..013b6eb15 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "87", + "graphics_id": "MAP_OBJ_GFX_GIOVANNI", "x": 19, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "56" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 20, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "55" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "173" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "54" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 19, "y": 14, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "173" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 16, "y": 14, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "173" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "372" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 14, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "373" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 23, "elevation": 0, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 9532ffe65..265822796 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 6, "y": 28, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 19, "y": 16, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index bef2836ed..119352969 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 7, "y": 60, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 4, "y": 62, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 15, "y": 70, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 4, "y": 68, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 13, "y": 44, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 9, "y": 27, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 20, "elevation": 0, @@ -116,7 +116,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 22, "elevation": 0, @@ -129,7 +129,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 24, "elevation": 0, @@ -142,7 +142,7 @@ "flag": "20" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 26, "elevation": 0, diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index ad6d1d426..c6a6d57c6 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index ccb14b3db..73355e87c 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 6d216b553..aa6a4f459 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 19, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 31, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 28, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 38, "y": 15, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 50, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 42, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 50, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 57, "y": 16, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 32, "y": 18, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 42, "y": 12, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "449" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 63, "y": 13, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "462" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 752346bbd..2806f681c 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 4, "y": 10, "elevation": 0, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 767612c7b..dfe0c5030 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index ec853ac3c..c5e15685d 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 17, "y": 32, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 9, "y": 40, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 16, "y": 47, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 13, "y": 59, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "109", + "graphics_id": "MAP_OBJ_GFX_SNORLAX", "x": 14, "y": 70, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "84" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 13, "y": 92, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 10, "y": 99, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 18, "y": 108, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 100, "elevation": 3, @@ -147,7 +147,7 @@ "flag": "18" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 36, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "382" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 101, "elevation": 3, @@ -173,7 +173,7 @@ "flag": "383" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 19, "y": 64, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 19, "y": 63, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 12, "y": 111, "elevation": 3, diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 6706d8b02..366c3e2c7 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 7c4beb37a..a133ae23f 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 4b1ed933e..687ac9bf6 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 79920bc35..aca567b0d 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 5, "elevation": 3, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 9ce58a1c3..025e2b85a 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 7, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "20" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index cdf6e21d1..fdd8ace65 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 22, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 31, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 37, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 44, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 50, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 59, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 63, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 52, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 54, "y": 12, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 28, "y": 6, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 20, "y": 6, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "384" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 39, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 40, "y": 7, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 5d94699d2..745e9e2c2 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index aa86a9719..fc6391217 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index c3b757027..36d03530a 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 16, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 12, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 8, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 6, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 41, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "18" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 30, "y": 5, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 31, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "109", + "graphics_id": "MAP_OBJ_GFX_SNORLAX", "x": 31, "y": 13, "elevation": 3, diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index c848e5b76..eb7e79232 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "133", + "graphics_id": "MAP_OBJ_GFX_FEAROW", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 8ee9a145a..52272f873 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 22f87439e..adec1e6b3 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 10, "y": 6, "elevation": 0, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 293f240cb..50dffa554 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 4, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 11, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 15, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 18, "y": 41, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 38, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 2, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 21, "y": 61, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 18, "y": 94, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 16, "y": 134, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 4, "y": 116, "elevation": 3, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 48301e386..9ced2a41f 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 39, "y": 12, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 610a84f34..803722807 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 3f981016e..5731ecd8c 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 111cf1b71..439c5f405 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "45", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "45", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, "elevation": 1, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "36", + "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", "x": 9, "y": 41, "elevation": 1, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 33ed43697..fd9c5c069 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "20" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "21" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "22" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "340" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 73ef3ed73..845320666 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 16, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 43, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 73, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 69, "y": 3, "elevation": 3, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 2c8557d5b..c7640556b 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 7, "y": 27, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 16, "y": 26, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "36", + "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", "x": 15, "y": 35, "elevation": 1, diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index e863fbdb9..0895e18f1 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 14, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 10, "y": 29, "elevation": 1, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 5a5969bb3..605d5eb14 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 25, "y": 4, "elevation": 3, diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 71a4802f7..1a034d844 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index c3ae64311..23bdbdd2d 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 15, "y": 149, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 8, "y": 140, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 14, "y": 123, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 16, "y": 112, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 10, "y": 94, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 14, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 35, "elevation": 3, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 3e70326ab..0d7507633 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 12, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "49" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 12, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 10, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 12, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 10, "y": 28, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 12, "y": 31, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 5, "y": 21, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 4, "elevation": 3, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index deb88692f..0b79dde41 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 18, "y": 2, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 17, "y": 7, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 22, "y": 4, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 22, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 27, "y": 9, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 28, "y": 4, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 36, "y": 4, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 42, "y": 5, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 26, "y": 2, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "355" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 3, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "18" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 49, "y": 10, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 49, "y": 11, "elevation": 3, diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index ec9a5c284..128acb099 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 7, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "51" }, { - "graphics_id": "113", + "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", "x": 10, "y": 6, "elevation": 3, diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index de3df77b1..e895e6c89 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 639be8eb0..9833021a2 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index fab8a8b03..1ee618faa 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 3f4e03f3e..808232f30 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 6abc5a057..01e646702 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 17, "y": 4, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 7fc1de770..7b0026c94 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 9, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 75, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 67, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "353" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 15, "y": 14, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 47, "y": 3, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 50, "y": 3, "elevation": 3, diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index f3401744c..936900208 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 12, "y": 6, "elevation": 0, diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index c6f93c618..45e1dd929 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index ca5aec3d2..efa1789d8 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 121e9f89b..7cf88dbcb 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index c3120f237..4c622bab2 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 13, "y": 33, "elevation": 3, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 2e0ac628d..f354d825c 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index c8bea59f8..baf05fc78 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 1906f5e67..41057eafb 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 62, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 55, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 51, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 29, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 29, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 29, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 21, "y": 3, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 9, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 33, "y": 15, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 47, "y": 12, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "19" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 40, "y": 3, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 41, "y": 3, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 24, "y": 17, "elevation": 3, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index c90244197..9a8bd58ba 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index d4693d246..1ef29c698 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "18" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "363" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 65, "y": 17, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index b2ceb6810..fff50854a 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 18, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 12, "y": 9, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 104a568ab..784405a63 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index fcc3d6bf0..5793556e0 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 0, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 2, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 615f4c9b1..da0466b37 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "131", + "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 0, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index c12b81c2d..4f8d00d91 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 6e86a11e8..bd987f990 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index c8e98e62a..8eca10460 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index aa2732f36..b93710fe4 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 3, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 36e4dfd79..9c9094a9e 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 30, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "61" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 6b7950e26..c590cad89 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 66f6c2e97..ec5dd93e0 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 3, "elevation": 0, diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index ed032b4b3..cec02b750 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 5fee6f393..3a67ca542 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index c9f3fe809..3759a810b 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 4f92d7599..4583c0fcb 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 1, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 3318b3553..654973f7d 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 2db8e4478..4a7460d85 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 635c1aadc..c72190617 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index caf5fb525..e452c6161 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index fbbf0545e..8fb8e9349 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index f80ab4f82..249582a93 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "134", + "graphics_id": "MAP_OBJ_GFX_MACHOKE", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 0, diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 664266e47..3c5b166f4 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "63", + "graphics_id": "MAP_OBJ_GFX_CAPTAIN", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index bd1e16bf3..fcf2204fe 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 12, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 14, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 13, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 6, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 9b53685fa..a3c567ea9 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "151", + "graphics_id": "MAP_OBJ_GFX_SS_ANNE", "x": 30, "y": 16, "elevation": 1, diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index e19200676..be4d95f8b 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 10, "elevation": 3, diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 3173c5dae..700aa87d1 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 2aade6512..17b2fb57a 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index fae8637ea..de59e1575 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 7, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index a2ccec451..09b1e09a7 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 2, "y": 2, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index abb8960ac..e97b979b7 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 15, "elevation": 3, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index e9b4475cf..9495368ad 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "386" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 37, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "387" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 31, "y": 18, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "388" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 36, "y": 17, "elevation": 4, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e02b44909..c45a2bbda 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 33, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "390" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 28, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "391" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 29, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 7eff5e68f..88838d5ff 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index f6e71091b..dd0db9475 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 28, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "393" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "392" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 16, "y": 27, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "394" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 27, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 48eba64e0..7064178fc 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -36,7 +36,7 @@ "connections_no_include": true, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 22, "y": 15, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 26, "y": 16, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 46, "y": 13, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 27, "y": 22, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 25, "y": 33, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 34, "y": 31, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 30, "y": 39, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "62" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 48, "y": 24, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "62" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 37, "y": 32, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "63" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 21, "y": 23, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "63" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 39, "y": 16, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "63" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 44, "y": 22, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "63" }, { - "graphics_id": "114", + "graphics_id": "MAP_OBJ_GFX_PIDGEOT", "x": 45, "y": 22, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "63" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 32, "y": 39, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "63" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 1b3c2ff04..1645e564a 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 1, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 6, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "96" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 24cd66c55..4f6f13afc 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 24, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 24, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 14, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 18, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "85", + "graphics_id": "MAP_OBJ_GFX_SABRINA", "x": 14, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 24, "y": 10, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 15, "y": 20, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 287f760d8..6a233f785 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 8, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index 3300f2355..bf53f87a9 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "132", + "graphics_id": "MAP_OBJ_GFX_DODUO", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "120", + "graphics_id": "MAP_OBJ_GFX_PIKACHU", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "115", + "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 0b87576cd..4c6e64a1d 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "116", + "graphics_id": "MAP_OBJ_GFX_PIDGEY", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index f4b227795..51f9c8294 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 1bfe45aca..d4248d680 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 118936b0e..f963d1184 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "174" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 8fdf8ac26..ed564ac70 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index e702db16e..3bf92e3fb 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 6, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 3, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 3, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 9, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "110" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 7, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "109" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 9, "y": 12, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "111" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 5, "y": 11, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "108" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index a40335f0d..c7d7d89f3 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "64" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "65" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index c1003895d..2cf41f4f2 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "66" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "67" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 19, "y": 18, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "469" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 14, "elevation": 4, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index fdc44c9a5..1eaf0d500 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "68" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "69" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 15, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 2a3d9e902..3a202884c 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "70" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "71" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "74" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "75" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "73" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 11bc154d3..c721e7811 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "76" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 18, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "77" }, { - "graphics_id": "138", + "graphics_id": "MAP_OBJ_GFX_ARTICUNO", "x": 9, "y": 2, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "130" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 19, "elevation": 4, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index a227a7121..c9fe0c17b 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 7, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index d33245efd..cd88eae20 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index d319db640..066f3d18d 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 131c2531f..2336916fa 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 64f56ce7f..94f07f060 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 9, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index cac3cd8f6..587f07638 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 14, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 4, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "157" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 5952fb9b3..28e1dd365 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json index f6af3773a..578534c90 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index fdddaad59..504a835b9 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 13, "y": 36, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 3, "y": 35, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 3, "y": 36, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 7, "y": 56, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 11, "y": 63, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 14, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 14, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "18" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "23" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 47, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "27" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 45, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "487" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 38, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "488" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 23, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "489" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 8, "y": 26, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 538174ab0..13fdfbcdc 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 12, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 3, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 34, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 11, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 10, "y": 26, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 11, "y": 17, "elevation": 5, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 3b38de1a7..39afb5a0a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 4, "elevation": 0, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index a024891b4..a7871b510 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 35, "y": 7, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 121, "y": 11, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 85, "y": 8, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 85, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index bef9fe3b5..0b0e45ebe 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 56, "y": 26, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 56, "y": 29, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index a830c85d0..532daae51 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 11, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 10, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 6fdc50198..e8de15ddc 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index d697f3adb..802ba5bd4 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index f6b7336ee..3774fc22f 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index c5ce3d4c7..dc69e9504 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 5fc6fc1df..44d5f950a 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 2ede0ac79..4d063d090 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index a04a282bf..065169b6d 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index b690a29dd..0b3bc2fc5 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 12, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index ade5bc46c..d75337d2e 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 259d19e14..8faa6e7f5 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 0, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "407" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 15, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "408" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 2b7273aa4..4014beb4e 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 9, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 11, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "87", + "graphics_id": "MAP_OBJ_GFX_GIOVANNI", "x": 6, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 16, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "83" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "457" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 2, "y": 19, "elevation": 3, diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index d82ff755d..62409cf7e 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 3, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 837dd17c6..7b2b65641 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 29, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 28, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 20, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 19, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "83" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 4, "elevation": 0, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 7cf859092..0567a351f 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 25, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 31, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 3e6b8f251..dc0e5a20b 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 33, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 19, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "83" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 14, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 5, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "397" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "398" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "399" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 18, "elevation": 0, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 448086745..860cc1701 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 35, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 23, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "83" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 16, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 11, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "83" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "400" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 18, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "401" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "402" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index eb11b0a00..e41beefea 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 21, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 23, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 24, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 22, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 14, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 16, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 9, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "83" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "403" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 17, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "404" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 18, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 40d730698..67bc96a41 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "78" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 0, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 24, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 24, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 13, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "83" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 10, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 13, "y": 14, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 9, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "83" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 0, "y": 12, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "405" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 11, "elevation": 3, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 17c3a344a..7e51d2dc5 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 28, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "83" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "83" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 2, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "456" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 29, "y": 9, "elevation": 3, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 5c78ba07d..d6edefc9b 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 26, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "83" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 15, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "83" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 2, "y": 16, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 89530bed1..fd22ab27d 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 10, "y": 15, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 0f78765b5..b0b164629 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "100", + "graphics_id": "MAP_OBJ_GFX_SAPPHIRE", "x": 7, "y": 7, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "143" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 9, "elevation": 3, diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 03f33948b..f625f171b 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index c86d93e32..4469af84e 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 1e82148ef..447c0a10c 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 74cf54daa..e0852cc49 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 8, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 969e9a45d..025217635 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 24, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "136" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 12, "y": 15, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, "elevation": 1, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "36", + "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", "x": 11, "y": 44, "elevation": 1, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 52ce32061..8763c72fa 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 48, "y": 15, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 51, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 37, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 32, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 52, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 8, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 39, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 3, "y": 9, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 19, "y": 24, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 30, "y": 19, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 9b3a2b671..dbb6c6757 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 5, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "152" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 2a0b353b1..a5d38fc08 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index eea1088f5..77ec0eeaa 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 24, "y": 25, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "142" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 32, "y": 11, "elevation": 5, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 33, "y": 16, "elevation": 5, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 31, "y": 24, "elevation": 5, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 14, "y": 10, "elevation": 5, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 21, "y": 29, "elevation": 5, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 42, "y": 33, "elevation": 3, @@ -202,7 +202,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 33, "elevation": 3, @@ -215,7 +215,7 @@ "flag": "485" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 19, "y": 11, "elevation": 5, @@ -228,7 +228,7 @@ "flag": "484" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 43, "y": 32, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 5c298799a..90e0ddf10 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 12, "y": 13, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 11, "y": 52, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, "elevation": 1, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, "elevation": 1, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 6, "y": 21, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 7, "y": 21, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 11, "y": 76, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 19, "elevation": 0, @@ -134,7 +134,7 @@ "flag": "482" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 87, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 482b278be..c889d7a5a 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index dbe2dfc1e..818e179f4 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 7cd266f05..f42fb0dd7 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 7, "y": 24, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "126" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 8, "y": 23, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "126" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 8, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "145" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 9, "y": 23, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "121" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 9, "y": 24, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "121" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 22, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "121" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 24, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "121" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 11, "y": 23, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "121" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 20, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "18" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 17, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "443" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 15, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 14, "y": 14, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "132", + "graphics_id": "MAP_OBJ_GFX_DODUO", "x": 15, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 15, "y": 31, "elevation": 3, diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index fa2cc2958..323ac255e 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "122" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 12, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 19, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 23, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "20" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 38, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "21" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "22" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 29, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "23" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 16, "y": 43, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "24" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 17, "y": 39, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "25" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 14, "y": 39, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "26" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 39, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "27" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 5, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "490" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "491" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 43, "elevation": 3, diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 6cbfbad50..c9aaffdff 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 27, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 68, "y": 10, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "37", + "graphics_id": "MAP_OBJ_GFX_TUBER_F", "x": 33, "y": 13, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "37", + "graphics_id": "MAP_OBJ_GFX_TUBER_F", "x": 50, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 77, "y": 5, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 78, "y": 5, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 72, "y": 8, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 86, "y": 13, "elevation": 3, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 78cd6003c..8818603b5 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 23, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 58cee2b93..dfce743a3 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index dc2b5321f..b9bf65eaf 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 0, diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index a596b88c0..681380cc9 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 0ba900bc6..df96d64eb 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index c1ceda273..a518b76d8 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index b36be2276..c5f567825 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 14e94407b..f27177490 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 2, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index b3e593a18..83fec9da8 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 02fd95e39..167aebf6d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index bbc809fc1..87552c5f8 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 14, "y": 9, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 8, "y": 8, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "121" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index ff7b3c601..b0ff63ec1 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "123" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "124" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "125" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "18" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "442" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 24, "y": 12, "elevation": 3, diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 75b7fb2eb..93538a4c9 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 0fed41496..0fb8e4f6b 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index fe6e2a80c..66f6aabed 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 3b0ef6e54..2082f25f9 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 5, "y": 5, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 5, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "116" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 1, @@ -53,7 +53,7 @@ "flag": "117" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 104e8fb2e..4b227d7b7 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 89ef1c015..d701f3ccd 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index c6a7a20ef..107b622f6 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 3620937c7..a839da159 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index ef8888b06..cce927999 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 6791d7100..dd73060a4 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index ffebedc43..dc4ac7d19 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index 5d40fa820..65c7875bb 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 742239cd3..de002c33f 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index ed9be424f..be536383a 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "102" }, { - "graphics_id": "247", + "graphics_id": "MAP_OBJ_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "106" }, { - "graphics_id": "246", + "graphics_id": "MAP_OBJ_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "105" }, { - "graphics_id": "245", + "graphics_id": "MAP_OBJ_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "104" }, { - "graphics_id": "244", + "graphics_id": "MAP_OBJ_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "103" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "101" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "100" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 8649006c4..ee747f3e1 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 22, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 36, "y": 10, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "130", + "graphics_id": "MAP_OBJ_GFX_MACHOP", "x": 35, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 31, "y": 30, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 24, "y": 33, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 19, "y": 24, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "18" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 25, "y": 7, "elevation": 3, diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index dfb904da2..c5a9d6d38 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "82", + "graphics_id": "MAP_OBJ_GFX_LT_SURGE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 4, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 7, "y": 8, "elevation": 3, diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index f83e884a9..c45c3f65f 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 980e3eae8..94cbf7c94 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 4ef4347b3..d1a3688f0 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "116", + "graphics_id": "MAP_OBJ_GFX_PIDGEY", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 6, "y": 4, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 519227231..f53ba795a 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 750104631..b32eef9b5 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 6, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "160" }, { - "graphics_id": "0", + "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", "x": 3, "y": 1, "elevation": 0, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 7c0a45d41..c1e3c359d 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 4d5c86771..f4ec8fe14 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 5, "y": 4, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 6, "y": 4, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "120", + "graphics_id": "MAP_OBJ_GFX_PIKACHU", "x": 7, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "126", + "graphics_id": "MAP_OBJ_GFX_SEEL", "x": 4, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 0, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 140c78dce..add43603e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 14, "y": 6, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "425" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "426" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 16, "y": 3, "elevation": 3, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index a477c4474..092ade4a5 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 20, "y": 11, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 31, "y": 16, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 26, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 36, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "427" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 40, "y": 7, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "428" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 25, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "429" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 14, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "430" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 33, "y": 19, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "88" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 40, "y": 9, "elevation": 3, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 609326d0f..e82abc58f 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 21, "y": 5, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 10, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 38, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "431" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "432" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "89" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 32, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 38, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 39, "y": 13, "elevation": 3, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 394f58d7e..6b132ab5d 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 8, "y": 26, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 24, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "17" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 34, "y": 11, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 21, "y": 6, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 20, "y": 12, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 33, "y": 26, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 16, "y": 22, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 18, "y": 5, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "18" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 54ac81980..fc52f94b9 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -15,17 +15,17 @@ ViridianCity_MapScript1_1658D9:: @ 81658D9 end EventScript_165909:: @ 8165909 - setvar VAR_0x4010, 32 + setvar VAR_OBJ_GFX_ID_0, 32 return EventScript_16590F:: @ 816590F - setvar VAR_0x4010, 32 + setvar VAR_OBJ_GFX_ID_0, 32 setobjectxyperm 4, 21, 8 setobjectmovementtype 4, 1 return EventScript_165920:: @ 8165920 - setvar VAR_0x4010, 34 + setvar VAR_OBJ_GFX_ID_0, 34 setobjectxyperm 4, 21, 11 setobjectmovementtype 4, 8 return diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 9da176120..bc622f449 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 10, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 12, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 10, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 2, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 3, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 6, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "87", + "graphics_id": "MAP_OBJ_GFX_GIOVANNI", "x": 2, "y": 2, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "85" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 16, "y": 20, "elevation": 3, diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 628b66dd0..edc6072ab 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "110", + "graphics_id": "MAP_OBJ_GFX_SPEAROW", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 3b3bc76a0..a3abf9f9d 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 122ef65d3..350ed4020 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 0d2f95957..419e7b4ca 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 4, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 16c5033d1..27900e068 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index b59fbccd6..952013612 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 29, "y": 58, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 45, "y": 58, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 47, "y": 45, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 47, "y": 29, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 7, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 41, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "342" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 40, "y": 21, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "343" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 21, "y": 34, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "344" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 43, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 16, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 49, "y": 60, "elevation": 3, diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h index 9e7edc256..b6154da17 100644 --- a/include/constants/map_objects.h +++ b/include/constants/map_objects.h @@ -154,6 +154,23 @@ #define MAP_OBJ_GFX_DEOXYS_N 150 #define MAP_OBJ_GFX_SS_ANNE 151 +#define MAP_OBJ_GFX_VAR_0 240 +#define MAP_OBJ_GFX_VAR_1 241 +#define MAP_OBJ_GFX_VAR_2 242 +#define MAP_OBJ_GFX_VAR_3 243 +#define MAP_OBJ_GFX_VAR_4 244 +#define MAP_OBJ_GFX_VAR_5 245 +#define MAP_OBJ_GFX_VAR_6 246 +#define MAP_OBJ_GFX_VAR_7 247 +#define MAP_OBJ_GFX_VAR_8 248 +#define MAP_OBJ_GFX_VAR_9 249 +#define MAP_OBJ_GFX_VAR_A 250 +#define MAP_OBJ_GFX_VAR_B 251 +#define MAP_OBJ_GFX_VAR_C 252 +#define MAP_OBJ_GFX_VAR_D 253 +#define MAP_OBJ_GFX_VAR_E 254 +#define MAP_OBJ_GFX_VAR_F 255 + #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 #define SHADOW_SIZE_L 2 diff --git a/include/constants/vars.h b/include/constants/vars.h index a41e67392..8a932b1d1 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -19,29 +19,29 @@ #define VAR_0x400D 0x400D #define VAR_0x400E 0x400E #define VAR_0x400F 0x400F -#define VAR_0x4010 0x4010 -#define VAR_0x4011 0x4011 -#define VAR_0x4012 0x4012 -#define VAR_0x4013 0x4013 -#define VAR_0x4014 0x4014 -#define VAR_0x4015 0x4015 -#define VAR_0x4016 0x4016 -#define VAR_0x4017 0x4017 -#define VAR_0x4018 0x4018 -#define VAR_0x4019 0x4019 -#define VAR_0x401A 0x401A -#define VAR_0x401B 0x401B -#define VAR_0x401C 0x401C -#define VAR_0x401D 0x401D -#define VAR_0x401E 0x401E -#define VAR_0x401F 0x401F +#define VAR_OBJ_GFX_ID_0 0x4010 +#define VAR_OBJ_GFX_ID_1 0x4011 +#define VAR_OBJ_GFX_ID_2 0x4012 +#define VAR_OBJ_GFX_ID_3 0x4013 +#define VAR_OBJ_GFX_ID_4 0x4014 +#define VAR_OBJ_GFX_ID_5 0x4015 +#define VAR_OBJ_GFX_ID_6 0x4016 +#define VAR_OBJ_GFX_ID_7 0x4017 +#define VAR_OBJ_GFX_ID_8 0x4018 +#define VAR_OBJ_GFX_ID_9 0x4019 +#define VAR_OBJ_GFX_ID_A 0x401A +#define VAR_OBJ_GFX_ID_B 0x401B +#define VAR_OBJ_GFX_ID_C 0x401C +#define VAR_OBJ_GFX_ID_D 0x401D +#define VAR_OBJ_GFX_ID_E 0x401E +#define VAR_OBJ_GFX_ID_F 0x401F #define VAR_REPEL_STEP_COUNT 0x4020 #define VAR_0x4021 0x4021 #define VAR_ICE_STEP_COUNT 0x4022 #define VAR_RENEWABLE_ITEM_STEP_COUNTER 0x4023 #define VAR_ALTERING_CAVE_WILD_SET 0x4024 #define VAR_0x4025 0x4025 -#define VAR_SECRET_BASE_MAP 0x4026 +#define VAR_0x4026 0x4026 #define VAR_0x4027 0x4027 #define VAR_0x4028 0x4028 #define VAR_0x4029 0x4029 diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index 741b92b40..cbaa780e6 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -559,7 +559,8 @@ void SetAllRenewableItemFlags(void) void IncrementRenewableHiddenItemStepCounter(void) { u16 var = VarGet(VAR_RENEWABLE_ITEM_STEP_COUNTER); - if (var < 1500) { + if (var < 1500) + { VarSet(VAR_RENEWABLE_ITEM_STEP_COUNTER, var + 1); } } @@ -606,4 +607,3 @@ static void SampleRenewableItemFlags(void) } } } - diff --git a/src/trainer_tower.c b/src/trainer_tower.c index def4fc37d..c5631ee1b 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -653,7 +653,7 @@ void sub_815DDB0(void) r1 = gUnknown_8479ED8[r3].unk0; else r1 = 18; - VarSet(VAR_0x4011, r1); + VarSet(VAR_OBJ_GFX_ID_1, r1); break; case 1: r2 = gUnknown_203F458->unk_0004.trainers[gUnknown_203F458->unk_0000].unk_004[0].unk_00B; @@ -672,8 +672,8 @@ void sub_815DDB0(void) r1 = 18; r4_ = 18; } - VarSet(VAR_0x4010, r1); - VarSet(VAR_0x4013, r4_); + VarSet(VAR_OBJ_GFX_ID_0, r1); + VarSet(VAR_OBJ_GFX_ID_3, r4_); break; case 2: for (r4 = 0; r4 < 3; r4++) @@ -691,13 +691,13 @@ void sub_815DDB0(void) switch (r4) { case 0: - VarSet(VAR_0x4012, r1); + VarSet(VAR_OBJ_GFX_ID_2, r1); break; case 1: - VarSet(VAR_0x4010, r1); + VarSet(VAR_OBJ_GFX_ID_0, r1); break; case 2: - VarSet(VAR_0x4011, r1); + VarSet(VAR_OBJ_GFX_ID_1, r1); break; } } |