diff options
Diffstat (limited to 'data')
363 files changed, 1652 insertions, 1654 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b787a52a5..f66b4da77 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -18,7 +18,6 @@ #include "constants/field_effects.h" #include "constants/trainers.h" #include "constants/trainer_tower.h" -#include "constants/object_events.h" #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index c209c8501..be4036928 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -1,4 +1,4 @@ -#include "constants/object_events.h" +#include "constants/event_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -64,30 +64,30 @@ gUnknown_835B864:: @ 835B864 .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B874:: @ 835B874 - .byte OBJECT_EVENT_GFX_RED_NORMAL, OBJECT_EVENT_GFX_GREEN_NORMAL - .byte OBJECT_EVENT_GFX_RED_BIKE, OBJECT_EVENT_GFX_GREEN_BIKE - .byte OBJECT_EVENT_GFX_RED_SURF, OBJECT_EVENT_GFX_GREEN_SURF - .byte OBJECT_EVENT_GFX_RED_ITEM, OBJECT_EVENT_GFX_GREEN_ITEM - .byte OBJECT_EVENT_GFX_RED_FISH, OBJECT_EVENT_GFX_GREEN_FISH - .byte OBJECT_EVENT_GFX_RED_ITEM_COPY, OBJECT_EVENT_GFX_GREEN_ITEM_COPY + .byte OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL + .byte OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE + .byte OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF + .byte OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM + .byte OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH + .byte OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY gUnknown_835B880:: @ 835B880 - .byte OBJECT_EVENT_GFX_RS_BRENDAN - .byte OBJECT_EVENT_GFX_RS_MAY + .byte OBJ_EVENT_GFX_RS_BRENDAN + .byte OBJ_EVENT_GFX_RS_MAY gUnknown_835B882:: @ 835B882 @ Male - .byte OBJECT_EVENT_GFX_RED_NORMAL, 0x01 - .byte OBJECT_EVENT_GFX_RED_BIKE, 0x02 - .byte OBJECT_EVENT_GFX_RED_SURF, 0x08 + .byte OBJ_EVENT_GFX_RED_NORMAL, 0x01 + .byte OBJ_EVENT_GFX_RED_BIKE, 0x02 + .byte OBJ_EVENT_GFX_RED_SURF, 0x08 @ Female - .byte OBJECT_EVENT_GFX_GREEN_NORMAL, 0x01 - .byte OBJECT_EVENT_GFX_GREEN_BIKE, 0x02 - .byte OBJECT_EVENT_GFX_GREEN_SURF, 0x08 + .byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01 + .byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02 + .byte OBJ_EVENT_GFX_GREEN_SURF, 0x08 gUnknown_835B88E:: @ 835B88E - .byte OBJECT_EVENT_GFX_RED_VS_SEEKER - .byte OBJECT_EVENT_GFX_GREEN_VS_SEEKER + .byte OBJ_EVENT_GFX_RED_VS_SEEKER + .byte OBJ_EVENT_GFX_GREEN_VS_SEEKER gUnknown_835B890:: @ 835B890 .4byte MetatileBehavior_IsSouthArrowWarp diff --git a/data/map_events.s b/data/map_events.s index ce4d9efc3..62bd63b2e 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -10,7 +10,6 @@ #include "constants/vars.h" #include "constants/weather.h" @#include "constants/trainer_hill.h" -#include "constants/object_events.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index d9d80e7e9..b2f6c9186 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 5f8c86d9c..77bbc7ec0 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_METEORITE", + "graphics_id": "OBJ_EVENT_GFX_METEORITE", "x": 15, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_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 d58a16b85..e2e75550a 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_OnReturnToField:: @ 8165213 BirthIsland_Exterior_OnTransition:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index dfc063ad9..7f5ad6124 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index b9ed79113..f635220e1 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 48, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 38, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH", + "graphics_id": "OBJ_EVENT_GFX_POLIWRATH", "x": 36, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 22, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 30, "y": 24, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 26, "y": 19, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 38, "y": 31, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 30, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 52, "y": 22, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 40, "y": 35, "elevation": 0, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 25, "y": 10, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": -7, "y": 21, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 264fd2aa6..6887e5d59 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", + "graphics_id": "OBJ_EVENT_GFX_MEOWTH", "x": 1, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", + "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 5, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 5, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 9, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 89d78d255..90cded248 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 0, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 3, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, "y": 10, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_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 4b7c69e3a..a8aa69f77 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 beb73045e..fa5630be8 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_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 31cf48f57..39b0f530b 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 8, "elevation": 0, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_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 4948847ef..ac47d8ac5 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 10, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 11, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 4, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 1, "y": 9, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 298d207c2..5d6cdb416 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 6, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 10, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_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 b2b31ef7f..5746f8363 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_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 861954bd3..7fed112f3 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 9, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 1733a8f35..063e7e74a 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 4, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 7, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 10, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 8, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 9, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, "y": 7, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 10, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_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 9dcaf101a..298855844 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 6, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 4, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_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 ac88b5869..230a033bb 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ERIKA", + "graphics_id": "OBJ_EVENT_GFX_ERIKA", "x": 6, "y": 4, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 8, "y": 7, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 6, "y": 8, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 3, "y": 5, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_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 964db9cab..66d15f518 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 9, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_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 37231d091..6201d5b3a 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_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 58df64cf8..301f33056 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 88dab9bec..83ded878c 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 b84bbabd6..7d6df6b05 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 12, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 9, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 0, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_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 beadaeab9..ee32088bc 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 5, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 1390abd3d..a19dac4e7 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 18, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 16, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 7dccb782c..cb873d731 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 9, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_MEWTWO", + "graphics_id": "OBJ_EVENT_GFX_MEWTWO", "x": 7, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MEWTWO" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 25c2333e0..b9e7f6106 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -37,7 +37,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 31, "y": 12, "elevation": 3, @@ -50,7 +50,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, "y": 6, "elevation": 3, @@ -63,7 +63,7 @@ "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 16, "y": 21, "elevation": 3, @@ -76,7 +76,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 9, "y": 23, "elevation": 3, @@ -89,7 +89,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", + "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 32, "y": 29, "elevation": 3, @@ -102,7 +102,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 29, "elevation": 3, @@ -115,7 +115,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 34, "y": 22, "elevation": 3, @@ -128,7 +128,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 22, "y": 0, "elevation": 3, @@ -141,7 +141,7 @@ "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 26, "y": 32, "elevation": 3, @@ -154,7 +154,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 50, "y": 18, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 30, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_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 4bf7375b8..1db90cc0f 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 9, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 afe882548..551bc0d9a 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 4, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MISTY", + "graphics_id": "OBJ_EVENT_GFX_MISTY", "x": 8, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_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 0b1d03a40..7233d7c66 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 69d20876a..8a36a82d3 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_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 33095af54..c9f6bd1b4 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_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 9c5a61b63..ea03d11d8 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_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 eae14c1e4..a1b7d870d 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_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 e247e3cd4..05bdb8773 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 dac0de4b5..fc302635f 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 5, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 7eb69e6a4..e12bbcad6 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 0c8fe0ac6..bd9c57435 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 20, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_CINNABAR_BILL" }, { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_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 1afa900b9..efa247390 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 25, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 25, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 17, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 16, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 16, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, "y": 19, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLAINE", + "graphics_id": "OBJ_EVENT_GFX_BLAINE", "x": 5, "y": 4, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_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 a02302367..67e4406ca 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 06ecc5419..eb919ff85 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 2, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_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 c4bcde4e4..455c51e9e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 4f446c65e..cd8a2df15 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 cefc5bcc4..4fc85fce5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 11, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 68d681613..e2f26713d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 54015fcc3..38688647e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 5, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 4427d4d17..9cf4e3093 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_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 591a998e3..77475f33c 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_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 ae9611f97..cf40eae9e 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 8, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 32, "y": 9, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index bfbcfd8f6..4cbf533e1 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 8e8e974ba..d75fa598d 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_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 a97c387d8..2a3c96e0c 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_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 fa79e4245..43b8fe08c 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_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 f1c963b0e..fcd1d90d6 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 50ecf922f..77cb971ab 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 5a8fef3d2..f5aeb1378 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 fc2dd61bf..b5c855413 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 84cddd2ea..2e920267d 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 2035f850e..844d47ac4 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_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 ea727f86d..6546c6e5a 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 18, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 27, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 8, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 68694d602..34edad014 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, "y": 44, "elevation": 4, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 6, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 14, "y": 17, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 17, "y": 31, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 31986b11c..5bb403d1c 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 975a71c51..4ff0f3a83 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 868b8cda7..ecb514ff8 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 44, "y": 10, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 12, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 12, "y": 10, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 23, "y": 9, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 3, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, "elevation": 1, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 4ab961ce8..2c2563031 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 96ff51d8c..6d6f5b7bc 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, "y": 15, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 27, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 6, "y": 6, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 27, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 25, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 3, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 16, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 78bfa06b4..627ee6b87 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 14, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 9a31449a1..ed72da60f 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 12, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 13, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 14, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", + "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 17, "y": 9, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 26, "y": 19, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 19, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 8, "y": 25, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 36, "y": 13, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 0c7760b98..6cd0223da 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 55889c185..3d4984879 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 8, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_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 b9ec87bc0..b83419325 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_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 7ecb022f9..5e126761e 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 c07a00e61..e93a3457a 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 f542cbfd9..c534c48f2 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 14, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_LORELEI", + "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 12, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_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 0b447056c..7dbe72a88 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LORELEI", + "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { - "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", + "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF", "x": 0, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SEEL", + "graphics_id": "OBJ_EVENT_GFX_SEEL", "x": 10, "y": 3, "elevation": 0, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 9, "y": 3, "elevation": 0, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", + "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE", "x": 7, "y": 2, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", + "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 6, "y": 2, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", + "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 6, "y": 4, "elevation": 0, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", + "graphics_id": "OBJ_EVENT_GFX_MEOWTH", "x": 9, "y": 4, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 10, "y": 4, "elevation": 0, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 0, "y": 3, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 0, "y": 5, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 1, "y": 5, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", + "graphics_id": "OBJ_EVENT_GFX_PIDGEOT", "x": 9, "y": 0, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_FEAROW", + "graphics_id": "OBJ_EVENT_GFX_FEAROW", "x": 10, "y": 0, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL", + "graphics_id": "OBJ_EVENT_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 901bcf22d..f5820fef9 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_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 f5a0751ae..a8bf5fa97 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 10, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 9818ab609..b6cdf9483 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 3d380f53c..b026f7030 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 5aeab97b9..da9946432 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 37, "y": 17, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", + "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE", "x": 36, "y": 15, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VOLTORB", + "graphics_id": "OBJ_EVENT_GFX_VOLTORB", "x": 33, "y": 8, "elevation": 3, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 11, "elevation": 3, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 39, "y": 8, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 15, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LAPRAS", + "graphics_id": "OBJ_EVENT_GFX_LAPRAS", "x": 12, "y": 20, "elevation": 1, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 20, "elevation": 3, @@ -136,7 +136,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 8, "y": 8, "elevation": 1, @@ -149,7 +149,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_KANGASKHAN", + "graphics_id": "OBJ_EVENT_GFX_KANGASKHAN", "x": 16, "y": 9, "elevation": 3, @@ -162,7 +162,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 10, "elevation": 3, @@ -175,7 +175,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 21, "y": 13, "elevation": 3, @@ -188,7 +188,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 32, "y": 16, "elevation": 3, @@ -201,7 +201,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 24, "y": 22, "elevation": 3, @@ -214,7 +214,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 11, "elevation": 3, @@ -227,7 +227,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 5f0875db8..ee144bf4c 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -9,11 +9,11 @@ FuchsiaCity_OnTransition:: @ 8166D7B end FuchsicaCity_EventScript_SetOmanyteGfx:: @ 8166D91 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OMANYTE return FuchsiaCity_EventScript_SetKabutoGfx:: @ 8166D97 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_KABUTO return FuchsiaCity_EventScript_LittleBoy:: @ 8166D9D diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index c07403503..c14782953 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 16, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 2, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 11, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 13, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 6, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 2, "y": 16, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_KOGA", + "graphics_id": "OBJ_EVENT_GFX_KOGA", "x": 7, "y": 13, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_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 a45861216..f54074598 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_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 b90a8e3cc..2d6516978 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_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 8454ca7de..ac3b1ce35 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 6b8a28db2..64f2bfc92 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_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 7df358659..253b544ce 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 13, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 c2a20fb9e..c6069c491 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 d10098769..b0e5ce5db 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 7, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index fc65b8308..eb5d1c326 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index f6333f402..bf130d7e2 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 70c8e240c..1512276d4 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 11, "y": 6, "elevation": 0, @@ -35,7 +35,7 @@ "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_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 ff5e1b0ca..ec32e96ec 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 0, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 13, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 14, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 5, "y": 3, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 23, "y": 13, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 16, "y": 15, "elevation": 3, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 6eeb47d03..eaea7e788 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index c3e98f4e9..5205e43e0 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 19, "y": 10, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 12, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_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 23f767cad..79217f6b3 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUBONE", + "graphics_id": "OBJ_EVENT_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 0318b07a8..cdd978063 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 44e4fdb2f..8b80604c0 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 9, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 955d6f37c..7a5413d63 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 0605f499a..89034ca3e 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 e292b44e4..14781ded3 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", + "graphics_id": "OBJ_EVENT_GFX_MR_FUJI", "x": 3, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORINO", + "graphics_id": "OBJ_EVENT_GFX_NIDORINO", "x": 1, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", + "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 9, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 9, "y": 5, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 fcdf6edb2..2ffa70dbb 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 29, "y": 45, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 41, "y": 40, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 42, "y": 40, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 22, "y": 35, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 15, "y": 28, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 42, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 17, "elevation": 3, @@ -211,7 +211,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, "elevation": 3, @@ -224,7 +224,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, "elevation": 3, @@ -237,7 +237,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 6, "elevation": 3, @@ -250,7 +250,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 10, "elevation": 3, @@ -263,7 +263,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 e0f972558..3f6153369 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 46362d54e..5a9ed2ccc 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 11ec64838..c7d4e2f34 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 29d74a5a6..4c83d7a9b 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 47e9c1c87..375c6beb5 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 698499402..29f75c76d 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_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 2d0964a1d..ccd53263e 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_RUBY", + "graphics_id": "OBJ_EVENT_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 3545b5ba2..286baa86a 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MOLTRES", + "graphics_id": "OBJ_EVENT_GFX_MOLTRES", "x": 9, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_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 02496f3e9..9698a5529 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 f5b829469..4bfd935f9 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 20, "y": 26, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 36, "y": 30, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 30, "y": 35, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 26, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 17, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 10, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 22, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 35, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 35, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 44, "y": 21, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 f0a3ba3a9..2dfe5c967 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 13, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_DOME_FOSSIL" }, { - "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 14, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, "y": 11, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 37, "y": 21, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 12, "y": 20, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 35, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 18, "y": 27, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 26, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 5, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 6, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 98d1145fc..ee229f592 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LUGIA", + "graphics_id": "OBJ_EVENT_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 796f67e5f..cb4f1b2e3 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 3c2f599d5..db1f961b4 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HO_OH", + "graphics_id": "OBJ_EVENT_GFX_HO_OH", "x": 9, "y": 6, "elevation": 0, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 06d8b7c6d..0fa530aa2 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 a505aa5d0..fd3210c7e 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 8ef48b424..6a8f21cfc 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_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 bb9b1da3f..c9ce2a7b0 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_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 01e5b92e7..83aa1eadc 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, "elevation": 1, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, "elevation": 1, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 15, "y": 25, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 16, "y": 64, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 64, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 89, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 108, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 8, "y": 68, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 68, "elevation": 3, @@ -191,7 +191,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, "elevation": 3, @@ -204,7 +204,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, "elevation": 3, @@ -217,7 +217,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, "elevation": 3, @@ -230,7 +230,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, "elevation": 3, @@ -243,7 +243,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, "elevation": 3, @@ -256,7 +256,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, "elevation": 3, @@ -269,7 +269,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, "elevation": 3, @@ -282,7 +282,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, "elevation": 3, @@ -295,7 +295,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, "elevation": 3, @@ -308,7 +308,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, "elevation": 4, @@ -321,7 +321,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, "elevation": 3, @@ -334,7 +334,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, "elevation": 3, @@ -347,7 +347,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, "elevation": 4, @@ -360,7 +360,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 70, "elevation": 3, @@ -373,7 +373,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 103, "elevation": 3, @@ -386,7 +386,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 0a50424cb..3472ab348 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 15, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 07d68dfc1..08df3284c 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 14, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CELIO", + "graphics_id": "OBJ_EVENT_GFX_CELIO", "x": 15, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 3, "y": 7, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 5b20f3609..33bafe5f8 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 2198e9b44..33eaf4781 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 13, "y": 20, "elevation": 3, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 58924be03..6ebe51cc2 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_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 6b44f7eb3..a1fb5c9c8 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_DAISY", + "graphics_id": "OBJ_EVENT_GFX_DAISY", "x": 10, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TOWN_MAP", + "graphics_id": "OBJ_EVENT_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 414766d99..ab8dabcf9 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MOM", + "graphics_id": "OBJ_EVENT_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 31e6014cb..fe8980b44 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 2, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 11, "y": 10, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 3, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 4, "elevation": 0, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 0, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 4, "elevation": 0, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, "y": 4, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { - "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", + "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 4, "y": 1, "elevation": 0, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_POKEDEX" }, { - "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", + "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 5, "y": 1, "elevation": 0, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index fb235f0c5..63d974e60 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 33, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 28, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 33, "y": 27, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 42, "y": 20, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 45c972196..c5009c369 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BROCK", + "graphics_id": "OBJ_EVENT_GFX_BROCK", "x": 6, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_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 ca16f11a1..29c5ad3db 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", + "graphics_id": "OBJ_EVENT_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 27fb0810c..5f22bc1d4 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_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 77983d9f3..233f0db8e 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 6, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_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 ced7102e2..ab2389c02 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 21, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_AMBER", + "graphics_id": "OBJ_EVENT_GFX_OLD_AMBER", "x": 22, "y": 3, "elevation": 0, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_OLD_AMBER" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 c7e1c8d8d..cce062e6d 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 0, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 15, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 e4858844c..61886cddc 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 2, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 2, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 10, "y": 7, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_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 445b86eb3..b7ab4725e 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 68dd0db42..f6434eed8 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_AGATHA", + "graphics_id": "OBJ_EVENT_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 6153f4808..e7e98233f 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BRUNO", + "graphics_id": "OBJ_EVENT_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 f8e9422c3..c6dd72917 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 6, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_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 16c9d05ec..7ae0b20ed 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_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 332ed15b8..5ec8fbcc0 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LANCE", + "graphics_id": "OBJ_EVENT_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 d308c7975..a46b2b859 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LORELEI", + "graphics_id": "OBJ_EVENT_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 da4e01f1e..f3d8d7d17 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 22, "y": 24, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 32, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 3701da351..17f1847ed 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 5, "y": 23, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 23, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 e3d599d9f..368d261db 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 7, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 22, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 c4a876461..37cd7c276 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 21, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 20, "y": 25, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 34, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 29, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 0b6d23cd3..1630baa5a 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 18, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 18, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 0d9b51490..22242eeb3 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 16, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_TOWER_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_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 8f234e935..1f06677f1 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 10, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 9, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 12, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 47ee6cc43..d6792d545 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 17, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 15, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 11, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 a1f0fc109..d421948e2 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 11, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 19, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 7, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 11, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 12, "y": 8, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 16, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 7ef95333a..ef6aa1f39 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 13, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 18, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 9, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 e01c53116..eb5d6675a 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", + "graphics_id": "OBJ_EVENT_GFX_MR_FUJI", "x": 11, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 18099fc15..70004aaa3 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 27, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 22, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 46, "y": 37, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 22, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ZAPDOS", + "graphics_id": "OBJ_EVENT_GFX_ZAPDOS", "x": 5, "y": 11, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_ZAPDOS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 38, "elevation": 3, diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 0a1f10925..b57d12d1c 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 6bb68f578..52ae9407e 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 26, "y": 28, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 39, "y": 27, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 45, "y": 24, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 20, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 5, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 10, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 22, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 bebd68148..6d172a9f6 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 2, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 11, "y": 15, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 41, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 23, "y": 23, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 15, "y": 33, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 29, "y": 35, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 29, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 37, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, "elevation": 3, @@ -211,7 +211,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, "elevation": 3, @@ -224,7 +224,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, "elevation": 3, @@ -237,7 +237,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, "elevation": 3, @@ -250,7 +250,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, "elevation": 3, @@ -263,7 +263,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, "elevation": 3, @@ -276,7 +276,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, "elevation": 3, @@ -289,7 +289,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, "elevation": 3, @@ -302,7 +302,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, "elevation": 3, @@ -315,7 +315,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, "elevation": 3, @@ -328,7 +328,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, "elevation": 3, @@ -341,7 +341,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_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 b80daf9d5..87a45d250 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 4, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 6, "y": 32, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 22, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 21, "y": 27, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 16, "elevation": 0, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 5daefa002..e2693393a 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 20, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 984757f1e..b6c4f9ab9 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 19, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 20, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 14, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 bd38e3b71..234dce9e6 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", + "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 19, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_SCOPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 4, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_LIFT_KEY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 19, "y": 14, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, "y": 14, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 14, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 23, "elevation": 0, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index d8af63766..fab0ef1f1 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 6, "y": 28, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 19, "y": 16, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index df387492a..7c44db6d9 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 60, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 62, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 15, "y": 70, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 68, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 13, "y": 44, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 27, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 20, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 22, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 24, "elevation": 0, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_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 3003e5115..203ae9295 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 f9aae8494..4222d144e 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index b77d1d7d3..f7d261a8e 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 31, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 28, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 38, "y": 15, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 42, "y": 8, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 50, "y": 14, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 16, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 32, "y": 18, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 63, "y": 13, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 9b8a3e36a..1746a2d9f 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_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 6a38e9aad..5ac6eb2d3 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 656116cc2..c46c45f2f 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 17, "y": 32, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 9, "y": 40, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 16, "y": 47, "elevation": 3, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 13, "y": 59, "elevation": 3, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", + "graphics_id": "OBJ_EVENT_GFX_SNORLAX", "x": 14, "y": 70, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 13, "y": 92, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 99, "elevation": 3, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 18, "y": 108, "elevation": 3, @@ -136,7 +136,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 100, "elevation": 3, @@ -149,7 +149,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 36, "elevation": 3, @@ -162,7 +162,7 @@ "flag": "FLAG_HIDE_ROUTE12_TM48" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 101, "elevation": 3, @@ -175,7 +175,7 @@ "flag": "FLAG_HIDE_ROUTE12_IRON" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 64, "elevation": 3, @@ -188,7 +188,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 19, "y": 63, "elevation": 3, @@ -201,7 +201,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_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 feab7038d..557dcb00c 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_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 cbbd3261b..c4b7818db 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_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 ff83df1b3..220589706 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 8386e6996..cd56c9244 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 5, "elevation": 3, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 13259af36..76c96e56c 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 7, "y": 26, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index fc65f0932..cd0581a20 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 31, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 37, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 44, "y": 13, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 50, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 59, "y": 12, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 63, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 52, "y": 8, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 54, "y": 12, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 6, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 6, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE15_TM18" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 39, "y": 7, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 40, "y": 7, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 73, "y": 7, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 0959512a2..39bf0cb41 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_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 1d21cd2b1..b11b7224a 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 0dd47cbc6..45617a334 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 16, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 12, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 12, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 14, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 6, "y": 14, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 41, "y": 11, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 5, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 31, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", + "graphics_id": "OBJ_EVENT_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 dc0d416f4..ec7b219d3 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FEAROW", + "graphics_id": "OBJ_EVENT_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 b9425a4a6..133fd5b09 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_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 551fb5e7a..03d205867 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 6, "elevation": 0, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 1afe3a6bf..fd640db01 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 4, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, "y": 24, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 18, "y": 41, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 38, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 2, "y": 61, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 21, "y": 61, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 18, "y": 94, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 16, "y": 134, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 4, "y": 116, "elevation": 3, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 6dd7673de..86eb04352 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_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 741c391f7..9b1250ac4 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_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 052fe0215..b542ae540 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index abb670524..b25ce0fec 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, "elevation": 1, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, "elevation": 1, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, "elevation": 1, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, "elevation": 1, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, "elevation": 1, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, "elevation": 1, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, "elevation": 1, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, "elevation": 1, @@ -170,7 +170,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_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 29563d779..720b484d8 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 6, "y": 85, diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index e97d95544..7a4de5f4f 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 16, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 43, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, "elevation": 1, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 73, "y": 16, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, "elevation": 1, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, "elevation": 1, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, "elevation": 1, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, "elevation": 1, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_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 417ae692d..556dd9746 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 7, "y": 27, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 16, "y": 26, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, "elevation": 1, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", "x": 15, "y": 35, "elevation": 1, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "in_connection": true, "x": 13, "y": -3, diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index ef022d513..ef43a429b 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 11, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 14, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, "elevation": 1, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_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 41aedc6e0..b4da63654 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_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 20414c25f..7e5e18115 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 145f20cf3..aeaa87f85 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 15, "y": 149, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, "y": 140, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, "y": 123, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 16, "y": 112, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 10, "y": 94, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, "y": 61, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 35, "elevation": 3, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 5fa15ddb3..29b394c67 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 22, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 25, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 28, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 31, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 5, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 4, "elevation": 3, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 88d68ca07..b36fe20cf 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 2, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 7, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 22, "y": 4, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 8, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 9, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 28, "y": 4, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 36, "y": 4, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 42, "y": 5, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 2, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "FLAG_HIDE_ROUTE25_TM43" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 3, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 49, "y": 10, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_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 8e4ac79c6..94327ef65 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 7, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", + "graphics_id": "OBJ_EVENT_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 613f1d207..cb8c744ba 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_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 fdf66afb1..c47eeaf4a 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_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 478b3045e..c6d71095c 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_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 17e756798..0e749a29f 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 7651e395a..1dbccf3ac 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 4, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 9728a5ca1..fc4c4b53c 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 75, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 67, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_ROUTE4_TM05" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 15, "y": 14, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 47, "y": 3, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 50, "y": 3, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "in_connection": true, "x": 109, "y": 3, diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 5797e4600..b3f5a6740 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "graphics_id": "OBJ_EVENT_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 a71194174..2f8269dd9 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 826c71624..502a50bd9 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 5896d1664..94572a962 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 4ff0dc898..349f35369 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_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 40dd5c985..e13267a19 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 6aaffd6fc..09de5c2b8 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": -8, "y": 12, diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index a311c8eee..21c5d82a6 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 144ae1d3f..6da585949 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 62, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 55, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 51, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 29, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 6, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 3, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 33, "y": 15, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 47, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 40, "y": 3, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 41, "y": 3, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 16, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_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 fc6c97792..b0ebba722 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 123be8d5a..7fbff394d 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE9_TM40" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 87d778a25..6aa5b3093 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 18, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_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 d018cc7a4..620977574 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 765612f48..28c48fec7 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 0, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 e518ae50e..1d5bbe3fa 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", + "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF", "x": 4, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 c11aa16b5..c4a4350e2 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_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 51935aea2..8c35b38af 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 d6f0a1b44..3966857b9 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 315d49099..7f0e7b733 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 bb2df92ce..d355cfc4f 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 30, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 6fbbde902..7ddd88682 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 1692afc23..8d53e1c37 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 5, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 05ac70a4f..4143d53e5 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_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 116380880..fcbb580ae 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 ca0c68072..b1994b17a 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_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 fe00765ab..2e5f08349 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 1, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_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 fa9ad902a..5f3ed8cab 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 25286e3cc..ef9ccb433 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 bac380ea3..da783844a 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 e4fecec84..9c2d514d1 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 b72b8f2dd..eca95aa31 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 9f258f534..c19d4c7a0 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MACHOKE", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE", "x": 2, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 a87171f61..a514df616 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CAPTAIN", + "graphics_id": "OBJ_EVENT_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 be784748a..3ad57f09b 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 12, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 14, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 9, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 c37b2ac5c..b3805c4f6 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SS_ANNE", + "graphics_id": "OBJ_EVENT_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 d97f89317..d5ab6e972 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 10, "elevation": 3, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index cc2bd0e60..2b14d57d6 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 15, "elevation": 3, diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index fd3453ef3..7f82c3533 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index a7d35c6fa..a36d24a0e 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 15, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 18, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 17, "elevation": 4, diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 12e13fbaa..4871abfde 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 6, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index a4a73f8e2..4c1a7049b 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 98ac35b33..daf988506 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 7, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 6, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index cac992d41..9843d280f 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_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 451f7e96d..d7b77f4bc 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 27, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 24, "elevation": 3, diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index 4119d0714..f9da1257b 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 2, "y": 2, "elevation": 0, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index bfd629e91..5b61ffdd0 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -38,7 +38,7 @@ "connections_no_include": true, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 22, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 26, "y": 16, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 46, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 27, "y": 22, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 33, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 34, "y": 31, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 30, "y": 39, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 48, "y": 24, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 37, "y": 32, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 21, "y": 23, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 39, "y": 16, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 44, "y": 22, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", + "graphics_id": "OBJ_EVENT_GFX_PIDGEOT", "x": 45, "y": 22, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 32, "y": 39, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 9ae377f7c..949574481 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 8, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 9460fd5ca..77b75f09d 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 6, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 7, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 8f747efd5..1d2e8e575 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 1, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 1, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 24dd19564..d29379fc3 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 18, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 4, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 14, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 10, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 18, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SABRINA", + "graphics_id": "OBJ_EVENT_GFX_SABRINA", "x": 14, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 10, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 15, "y": 20, "elevation": 3, diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index df8e80208..02cef3897 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", + "graphics_id": "OBJ_EVENT_GFX_PIDGEY", "x": 0, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 31374c459..64142a6c4 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 62047365a..8cf965e59 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 0744a0812..de944ec7c 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 14, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index aeb3b40b6..4a28fd488 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 764ae5897..cd96e018c 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 12, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 11, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 12, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 5, "y": 11, "elevation": 3, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index fd9c6ca25..518817209 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 528d46ae9..6091f5d8c 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 18, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 5c7219195..b602137cc 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 02f2224ff..fb01fff9c 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_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 eae9e0c51..b1f1f6908 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 18, "elevation": 1, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ARTICUNO", + "graphics_id": "OBJ_EVENT_GFX_ARTICUNO", "x": 9, "y": 2, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ARTICUNO" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 19, "elevation": 4, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 065d2935d..c71782405 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 2a82fa1c1..5c1a8726a 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 1251e6366..052d7fa31 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_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 6309618e5..063535b54 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_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 8d1fcf724..16ff19533 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 9, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_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 e1bb2ec18..522d68473 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index e4249d7d5..5e9642ebb 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index b051ac85d..b9c1bc77e 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 13, "y": 36, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 35, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 3, "y": 36, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 56, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 63, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 14, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 14, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 47, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 45, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 38, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 23, "elevation": 3, @@ -274,7 +274,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_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 3f164568a..75c09cc6f 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 34, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 34, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 26, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 17, "elevation": 5, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "in_connection": true, "x": 7, "y": -2, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index d58fdc0ce..9dd436790 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 4, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 4, "elevation": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index fee7f725a..a27961b23 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 9955ca74f..37d70540c 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 35, "y": 7, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 121, "y": 11, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 85, "y": 8, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 be28ff7b0..29095ad7e 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 56, "y": 26, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 56, "y": 29, "elevation": 3, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index df2883596..0e04a2f1c 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 10, "y": 17, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 0, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 15, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 ad4efd4f0..458446a43 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 9, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 11, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", + "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 6, "y": 11, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, "y": 12, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_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 68748ef13..59c9bf374 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_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 249c2faea..e3fb80764 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 29, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 28, "y": 18, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 20, "y": 14, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 19, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 9a0439095..ffe70afbf 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 31, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 63bdff97e..080e2649c 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, "y": 16, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 19, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 14, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 5, "y": 5, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 13, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 c1890a062..0da89c2b1 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 35, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 23, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 11, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 18, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 21, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 5c27ff76a..c895f1d4b 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 21, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 23, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 24, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 22, "y": 13, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 14, "y": 9, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 16, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 17, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_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 ef3630954..261335452 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 2, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 0, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 10, "y": 10, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 13, "y": 14, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 9, "y": 14, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 12, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 db566d2dd..1f5ed77ca 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 28, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 17, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 5, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 8, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 f8bbd2b69..7cbb1c15d 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 16, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, "y": 18, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 16, "elevation": 0, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index e26f7bf49..ec8c1ffe3 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 10, "y": 15, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_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 19782a330..5ae17361a 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAPPHIRE", + "graphics_id": "OBJ_EVENT_GFX_SAPPHIRE", "x": 7, "y": 7, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 35d4cfb3f..ff6ad2c51 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_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 feb7ada29..e303ff025 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 67f1d4f31..2747a0cf0 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_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 b366a1d17..e208da76c 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_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 3498c7f3f..14828c8eb 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 24, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 12, "y": 15, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, "elevation": 1, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, "elevation": 1, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, "elevation": 1, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", "x": 11, "y": 44, "elevation": 1, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 8354730a5..e0d100f6c 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 48, "y": 15, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 51, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 13, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 37, "y": 23, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 32, "y": 5, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 52, "y": 20, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 21, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 6, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 9, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 24, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_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 2d14e64af..c866b4299 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 13, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_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 ce44fdfd2..5150e22fb 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 5020e7380..f800f0d0d 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 24, "y": 25, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 11, "elevation": 5, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 33, "y": 16, "elevation": 5, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 31, "y": 24, "elevation": 5, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 14, "y": 10, "elevation": 5, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 21, "y": 29, "elevation": 5, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -191,7 +191,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 42, "y": 33, "elevation": 3, @@ -204,7 +204,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 33, "elevation": 3, @@ -217,7 +217,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 11, "elevation": 5, @@ -230,7 +230,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 befdd7949..97e30aa5c 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 13, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 52, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, "elevation": 1, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, "elevation": 1, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 21, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 21, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 76, "elevation": 3, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 19, "elevation": 0, @@ -136,7 +136,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 c65f54deb..84a650469 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_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 e53676524..9dcdbd976 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index f9ed4394b..9ccf2b29d 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 24, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, "y": 23, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 24, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, "y": 24, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 22, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 24, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, "y": 23, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 20, "y": 7, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 17, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 15, "y": 7, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 14, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 15, "y": 14, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_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 ce8a868ef..446dc2074 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 23, "y": 17, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 38, "y": 23, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 23, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 29, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 16, "y": 43, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 17, "y": 39, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 14, "y": 39, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 39, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 5, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_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 fa674ecd9..e4e05fb76 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 27, "y": 10, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 68, "y": 10, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 33, "y": 13, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 50, "y": 11, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, "elevation": 1, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 77, "y": 5, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 78, "y": 5, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 72, "y": 8, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_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 3570c9e17..dca4bacd8 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_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 7bd2aa8e5..5864be00c 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 7d7384735..2174a571d 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 2ba098fd0..a2fc4f7e3 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_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 0de23d4a8..684e06a68 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_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 6a45fb357..c8aae0640 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_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 a774260f0..209fca3f8 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 7a89a37b1..84c4d70c5 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 2, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 070879098..65c74d9d8 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 4941fe37a..7ee060727 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 10469dc61..40b6fab36 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 14, "y": 9, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 8, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f4c54c987..8e740b6c0 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 20d83f19f..f8f793a1f 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index 9d60b2650..aa02b2212 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index a53c516b8..5dcbb119d 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 04378d0a4..b040ed8cb 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 569eaf978..45c0cf33c 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 128bb457a..23c4ff2bd 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 62e1bbe84..e6cb51f97 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 125751b98..2becc2697 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index da2cdb07f..e0ee44722 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 12, "y": 13, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 12, "elevation": 3, diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 985f2f186..c4ced59b3 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 20dd0f53e..668886176 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_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 5de5be5fa..fbe574cdc 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_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 694c644f3..076ea39f7 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_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 da5033107..2f45c143f 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_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 f8c3e8446..d15bc7d3b 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, "y": 5, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 5, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 1, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_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 96da34e0b..7001ab1cc 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 11, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_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 726bcfe11..24dcc7a4a 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 eee3d31bf..7e24aa5c8 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 6052b6192..e5514fc1f 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 ec8a01a32..70ec3cd4e 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_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 6fae45cf2..4f5ee081a 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index f46654c7b..cfc872f08 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index faf8f70f5..52e167ea7 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 22, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 36, "y": 10, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MACHOP", + "graphics_id": "OBJ_EVENT_GFX_MACHOP", "x": 35, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 31, "y": 30, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 33, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 24, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_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 4b0325bc1..eab43a7f5 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LT_SURGE", + "graphics_id": "OBJ_EVENT_GFX_LT_SURGE", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 4, "y": 17, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_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 6ec3be3f9..2e1269e8d 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_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 c22ef4744..4b8cd7cdd 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_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 fdbb6bd3e..c5cd83671 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", + "graphics_id": "OBJ_EVENT_GFX_PIDGEY", "x": 2, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 6, "y": 4, "elevation": 0, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_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 dfff61410..415d0eb48 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_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 595761c4f..74feb74fb 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 00e7ce529..fdc77b9a7 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_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 521e0c99f..4bf91321f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 4, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 6, "y": 4, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 7, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SEEL", + "graphics_id": "OBJ_EVENT_GFX_SEEL", "x": 4, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 0, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_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 21d57ae5e..f6c6811d1 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 6, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_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 764f448aa..184187cf3 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 20, "y": 11, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 31, "y": 16, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 26, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 36, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 7, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 13, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 19, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_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 a5985e5fc..76ea5245c 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 21, "y": 5, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 10, "y": 17, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 7, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 5, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 38, "y": 13, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 39, "y": 13, "elevation": 3, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index d9895c6b0..616e511ee 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 8, "y": 26, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 24, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 34, "y": 11, "elevation": 3, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 21, "y": 6, "elevation": 3, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, "y": 12, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 26, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 16, "y": 22, "elevation": 3, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, "y": 5, "elevation": 3, @@ -136,7 +136,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 4fb140b24..9e4f8f5c7 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -17,17 +17,17 @@ ViridianCity_OnTransition:: @ 81658D9 end ViridianCity_EventScript_SetOldManNormal:: @ 8165909 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1 return ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1 setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8 setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND return ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11 setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index f1188d2c0..0cc83f420 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 10, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 12, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 14, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 10, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 2, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 3, "y": 11, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 6, "y": 8, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", + "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 2, "y": 2, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 13, "y": 7, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_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 29f185b71..0b6247f93 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SPEAROW", + "graphics_id": "OBJ_EVENT_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 b5e65bbad..c770669e5 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_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 7b3de99b6..d650bfda6 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_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 780087d1b..d46b11f2c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 4, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_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 967493db5..76084ff0a 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 8a92127ae..a11b85a94 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 58, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 45, "y": 58, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 45, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 29, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 22, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 41, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 21, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 34, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 43, "y": 6, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 5, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 49, "y": 60, "elevation": 3, |