diff options
Diffstat (limited to 'data')
405 files changed, 2551 insertions, 2551 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b2622e181..ac5507d51 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1841,11 +1841,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E end RustboroCity_EventScript_1A0166:: @ 81A0166 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return RustboroCity_EventScript_1A016C:: @ 81A016C - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return LavaridgeTown_EventScript_1A0172:: @ 81A0172 @@ -1859,11 +1859,11 @@ Route119_EventScript_1A0172:: @ 81A0172 end LavaridgeTown_EventScript_1A018A:: @ 81A018A - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE return LavaridgeTown_EventScript_1A0190:: @ 81A0190 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE return AquaHideout_1F_EventScript_1A0196:: @ 81A0196 @@ -1890,30 +1890,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_MAXIE .else - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_ARCHIE .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1 - setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2 + setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_KYOGRE_1 + setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_KYOGRE_2 .else - setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1 - setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2 + setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_GROUDON_1 + setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_GROUDON_2 .endif return diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 0c1480c47..3c792cb58 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3322,4 +3322,4 @@ "blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9ba54183a..b1c4086c0 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 96d49a702..c65a79fdc 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 5, "y": 10, "elevation": 3, @@ -126,4 +126,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 2461f4f46..7c100a73e 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 2, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 9, "y": 6, "elevation": 3, @@ -107,4 +107,4 @@ "script": "AbandonedShip_Corridors_B1F_EventScript_15E9D3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index f6cd97821..73c3a0e96 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -50,4 +50,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 1f91ea0e6..78abf1e20 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -90,4 +90,4 @@ "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC98" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 1e7250a37..243d83bdf 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 41, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 11, "elevation": 3, @@ -212,4 +212,4 @@ "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 179130662..abbe32342 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 792287b70..1d9d75c42 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index d41973d6c..ce39a1b79 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, @@ -70,4 +70,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index dbff0fb56..e78ef41b1 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 276c9af99..5ae694e61 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 25, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 7, "elevation": 3, @@ -63,4 +63,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index a3e1bafb6..8e891b65d 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index ddffa3ccd..72b161120 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -22,4 +22,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index b9f8d49df..c9286da84 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "graphics_id": "OBJ_EVENT_GFX_REGISTEEL", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "AncientTomb_EventScript_15F042" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 711a88409..d9fac11ab 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 4, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 1bf19ee24..a5a26ae9b 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 27, "y": 18, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 20, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -295,4 +295,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index c15429c2a..11dcc1a40 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 13, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 19, "y": 20, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -170,4 +170,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_BattleRoom/map.json b/data/maps/BattleTower_BattleRoom/map.json index e01643833..848b03946 100644 --- a/data/maps/BattleTower_BattleRoom/map.json +++ b/data/maps/BattleTower_BattleRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 7, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Corridor/map.json b/data/maps/BattleTower_Corridor/map.json index bc61ba6e5..eec8217c8 100644 --- a/data/maps/BattleTower_Corridor/map.json +++ b/data/maps/BattleTower_Corridor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 2, "elevation": 3, @@ -28,4 +28,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Elevator/map.json b/data/maps/BattleTower_Elevator/map.json index fa1eed087..43e78ec05 100644 --- a/data/maps/BattleTower_Elevator/map.json +++ b/data/maps/BattleTower_Elevator/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, @@ -28,4 +28,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Lobby/map.json b/data/maps/BattleTower_Lobby/map.json index 8a155bb78..8b630bfdd 100644 --- a/data/maps/BattleTower_Lobby/map.json +++ b/data/maps/BattleTower_Lobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 12, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 4, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_REPORTER_BATTLE_TOWER" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 6, "elevation": 3, @@ -124,4 +124,4 @@ "script": "BattleTower_Lobby_EventScript_160727" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index c510f0232..bac2dff05 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -19,7 +19,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C compare VAR_0x8007, 50 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special TryInitBattleTowerAwardManEventObject + special TryInitBattleTowerAwardManObjectEvent return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD @@ -27,7 +27,7 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD compare VAR_0x8007, 100 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special TryInitBattleTowerAwardManEventObject + special TryInitBattleTowerAwardManObjectEvent return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 diff --git a/data/maps/BattleTower_Outside/map.json b/data/maps/BattleTower_Outside/map.json index 8fe21534b..761dc2a10 100644 --- a/data/maps/BattleTower_Outside/map.json +++ b/data/maps/BattleTower_Outside/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 18, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 10, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 19, "y": 26, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 24, "elevation": 3, @@ -97,4 +97,4 @@ "script": "BattleTower_Outside_EventScript_16025A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 1c5957605..0a12aa36e 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index d0c378768..ed873116c 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json index 793424743..9c35a6ad3 100644 --- a/data/maps/CaveOfOrigin_B2F/map.json +++ b/data/maps/CaveOfOrigin_B2F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index d6989c689..8dce96798 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 5, "elevation": 3, @@ -71,4 +71,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 31376fa77..8ab4aa087 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 10, "elevation": 3, @@ -64,4 +64,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 160d8f11f..12df1094b 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 6f9f801eb..6e8529525 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "graphics_id": "OBJ_EVENT_GFX_REGIROCK", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "DesertRuins_EventScript_15CB77" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 12baca163..9fe0e921d 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 12, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 9, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 12, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 8, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 6, "elevation": 3, @@ -168,4 +168,4 @@ "script": "DewfordTown_EventScript_14E0BD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 8d466ac25..eec89848c 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "graphics_id": "OBJ_EVENT_GFX_BRAWLY", "x": 14, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 1, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 5, "y": 24, "elevation": 3, @@ -128,4 +128,4 @@ "script": "DewfordTown_Gym_EventScript_15326E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 0f82fb6d0..ff4fa0065 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 4, "y": 6, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 1, "y": 5, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 4, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 3, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 5, "y": 2, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 14, "y": 7, "elevation": 0, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 15, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -164,4 +164,4 @@ "script": "DewfordTown_Hall_EventScript_153363" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index ea60b5b2a..d4774d408 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 4, "y": 2, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 502361cc0..87ab4a86b 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 6d45f5e01..bf90976b0 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 0, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 68322ae20..67ce247cc 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index b7c3bad8f..3ce7e8570 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -80,4 +80,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 5b45d25af..643d4db3d 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -190,4 +190,4 @@ "script": "EverGrandeCity_EventScript_1A00EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 4b581716c..67025f33f 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_RIVAL_CHAMPIONS_ROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 12, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor1/map.json b/data/maps/EverGrandeCity_Corridor1/map.json index d22b9db11..86723c0f2 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.json +++ b/data/maps/EverGrandeCity_Corridor1/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor2/map.json b/data/maps/EverGrandeCity_Corridor2/map.json index 6d87a7667..692e6daa7 100644 --- a/data/maps/EverGrandeCity_Corridor2/map.json +++ b/data/maps/EverGrandeCity_Corridor2/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor3/map.json b/data/maps/EverGrandeCity_Corridor3/map.json index f83993e77..aa5544f4d 100644 --- a/data/maps/EverGrandeCity_Corridor3/map.json +++ b/data/maps/EverGrandeCity_Corridor3/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor4/map.json b/data/maps/EverGrandeCity_Corridor4/map.json index c74147e67..9c0daf82f 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.json +++ b/data/maps/EverGrandeCity_Corridor4/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor5/map.json b/data/maps/EverGrandeCity_Corridor5/map.json index c1968cd1e..c310da938 100644 --- a/data/maps/EverGrandeCity_Corridor5/map.json +++ b/data/maps/EverGrandeCity_Corridor5/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index e26096649..c027a16f6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "graphics_id": "OBJ_EVENT_GFX_DRAKE", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 364c524e2..286bfdd39 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "graphics_id": "OBJ_EVENT_GFX_GLACIA", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index f4b7c36c8..297d66426 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 6, "y": 16, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 71b7eba91..36a42757d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "graphics_id": "OBJ_EVENT_GFX_PHOEBE", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 719252e66..2de6531f9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 7, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index c52dcb52c..dca22233b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index c5cfa4062..0a74924fc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 16, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 2, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index a3e51d8de..72ff929f6 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "graphics_id": "OBJ_EVENT_GFX_SIDNEY", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 2241e06b3..0d37b1514 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 11, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 9, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 15, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 12, "elevation": 3, @@ -179,4 +179,4 @@ "flag": "FLAG_HIDDEN_ITEM_1C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index 0c40a8767..40294eafb 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 19, "y": 8, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 7, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 0, "y": 15, "elevation": 0, @@ -86,4 +86,4 @@ "script": "FallarborTown_ContestHall_EventScript_153AEA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index cc0849449..d814c1b3c 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 2, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 0, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_FALLARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 2, "elevation": 3, @@ -148,4 +148,4 @@ "script": "FallarborTown_ContestLobby_EventScript_153AC2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index d2a9e287d..94a3ea653 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_PROF_COSMO_FALLARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index fa3cee306..b113df4ea 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index bb9f173d5..a2ef49c03 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index d5c94de23..7642da9bb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 9fab7e284..0279f1562 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 7db7c586a..1af09e409 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_FIERY_PATH_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 23, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 24, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 32, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 8e51423b3..79177c4c6 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 31, "y": 3, "elevation": 4, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 32, "y": 16, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 32, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 14, "elevation": 4, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 8, "y": 10, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 9, "y": 16, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 8, "elevation": 3, @@ -230,4 +230,4 @@ "script": "FortreeCity_EventScript_1A00E1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 6d3ea3a85..9dcd666c3 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 2, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index d2b78027e..d2a9b517e 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WINONA", + "graphics_id": "OBJ_EVENT_GFX_WINONA", "x": 4, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 12, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 9, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 18, "y": 19, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 18, "y": 1, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 19, "elevation": 3, @@ -125,4 +125,4 @@ "script": "FortreeCity_Gym_EventScript_157FED" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 47f18883c..b1dfbf2d7 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 7, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 6285e9693..5f14237e1 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 2, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 7859f5942..3f23b0ada 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 5, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 544c5e153..a217711ba 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 1, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5f8ecdcde..1b3535ddf 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 6, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index b12606304..366dd8d69 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 6, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 11d44415e..c18237db4 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 3, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 56d6484bb..7a19eb100 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 6d83020d3..be6ec6372 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 7, "elevation": 3, @@ -70,4 +70,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 92c124cff..65c55e08d 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 21, "elevation": 3, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 4c76d1534..5060b2f3b 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 16, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 22, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 6, "y": 22, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 21, "elevation": 3, @@ -185,4 +185,4 @@ "flag": "FLAG_HIDDEN_ITEM_31" } ] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 2a9c53104..28d6e9e8c 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 7, "y": 8, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 04065d10b..23d0d9acc 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 0, "elevation": 8, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 3, "elevation": 8, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 2, "y": 3, "elevation": 8, @@ -145,4 +145,4 @@ "script": "InsideOfTruck_EventScript_15FC8B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index f519a7003..93fbe62c9 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGICE", + "graphics_id": "OBJ_EVENT_GFX_REGICE", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "IslandCave_EventScript_15EF7C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 63de6d018..562ba58ed 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 18, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 16, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 24, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_JAGGED_PASS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 35, "elevation": 3, @@ -149,4 +149,4 @@ "flag": "FLAG_HIDDEN_ITEM_4C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index ef3ec701f..5f3efd98d 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -18,7 +18,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 7, "elevation": 3, @@ -31,7 +31,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 1, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 8, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 10, "y": 13, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 6, "y": 16, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 12, "y": 15, "elevation": 0, @@ -122,7 +122,7 @@ "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 4, "y": 7, "elevation": 3, @@ -256,4 +256,4 @@ "flag": "FLAG_HIDDEN_ITEM_0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 8abb700fe..8abc65dc9 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "graphics_id": "OBJ_EVENT_GFX_FLANNERY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 10, "y": 19, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 4, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 2, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 6, "y": 23, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 6, "y": 2, "elevation": 3, @@ -278,4 +278,4 @@ "script": "LavaridgeTown_Gym_1F_EventScript_153888" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 5b43c5bcb..4f11e429f 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -155,4 +155,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 041a08509..651ec648b 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 30a9e1505..4035f889a 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 2, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 6, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index cd194d233..060d69e0c 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 9, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index c6257850c..b823fcabe 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 6, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 3, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 6e32a6da9..ec48712c6 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 8e40cf42a..678e72a1f 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 32, "y": 20, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 15, "y": 18, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 28, "y": 28, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 21, "y": 15, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 16, "y": 9, "elevation": 5, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 35, "y": 27, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 35, "y": 37, "elevation": 5, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 34, "y": 37, "elevation": 5, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 17, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 73, "y": 15, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 61, "y": 36, "elevation": 5, @@ -166,7 +166,7 @@ "flag": "FLAG_ITEM_LILYCOVE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 43, "y": 18, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 46, "y": 12, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 45, "y": 12, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 38, "y": 9, "elevation": 5, @@ -218,7 +218,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 50, "y": 7, "elevation": 5, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 27, "y": 7, "elevation": 5, @@ -458,4 +458,4 @@ "flag": "FLAG_HIDDEN_ITEM_4B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 31d149109..b77a43092 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 30, "y": 30, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 11, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 40, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 12, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 15, "y": 22, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 25, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 25, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 25, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 16, "y": 25, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 24, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 18, "y": 24, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 24, "y": 10, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 27, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 22, "y": 13, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 24, "y": 13, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 26, "y": 13, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 28, "y": 13, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, "y": 10, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 30, "y": 11, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 8, "elevation": 3, @@ -285,7 +285,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 20, "elevation": 3, @@ -298,7 +298,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 36, "y": 22, "elevation": 3, @@ -311,7 +311,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 39, "y": 22, "elevation": 3, @@ -324,7 +324,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 34, "y": 25, "elevation": 3, @@ -337,7 +337,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 36, "y": 25, "elevation": 3, @@ -350,7 +350,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 38, "y": 25, "elevation": 3, @@ -363,7 +363,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 40, "y": 25, "elevation": 3, @@ -376,7 +376,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 32, "y": 23, "elevation": 3, @@ -389,7 +389,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 37, "y": 20, "elevation": 3, @@ -402,7 +402,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 42, "y": 24, "elevation": 3, @@ -415,7 +415,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 26, "elevation": 3, @@ -509,4 +509,4 @@ "script": "LilycoveCity_ContestHall_EventScript_159315" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 6d87bca77..ec02f26f1 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 1, "y": 1, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 14, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 20, "y": 2, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 8, "y": 10, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 18, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 19, "y": 9, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 1, "elevation": 0, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_ARTIST_LILCOVE_CONTEST" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 6, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 7, "elevation": 3, @@ -275,4 +275,4 @@ "script": "LilycoveCity_ContestLobby_EventScript_15908D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 92c382057..c7ef3cb00 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 3, "elevation": 3, @@ -60,4 +60,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index a24cad6ad..6d5093142 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 3, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 7, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -101,4 +101,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 146a13d89..9ea7fd933 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index cb8b47317..0ec2ad64b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN", "x": 6, "y": 1, "elevation": 3, @@ -79,4 +79,4 @@ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 7dea79e10..1d88cb7ae 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 4, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 6, "elevation": 3, @@ -131,4 +131,4 @@ "script": "LilycoveCity_DepartmentStore_1F_EventScript_159F05" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 77c1c429d..fa87aaa80 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 0, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 6, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 5734db8d1..a8b94d162 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 0, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 13, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 8, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 2, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index 62b267e00..17aa1c20c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 6, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 32233acd4..23da6139d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 1, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 15, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 17, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 5, "elevation": 3, @@ -128,4 +128,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_EmptyMap/map.json b/data/maps/LilycoveCity_EmptyMap/map.json index c762be1ef..555c36be7 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.json +++ b/data/maps/LilycoveCity_EmptyMap/map.json @@ -22,4 +22,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index a39d10445..1c58a59a7 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 13, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 10, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 436108db1..efc66e267 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 5bbf047eb..47d919218 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index b9a6565ba..ee0bd57b5 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 1, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 2, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 2, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -108,4 +108,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 7b0393b39..7645f5564 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index d24a66165..07ef68f64 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 12, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 2, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 3, "y": 8, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 11, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 19, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 6, "y": 2, "elevation": 3, @@ -296,4 +296,4 @@ "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15854F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index e463c2b09..64b70f3d1 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 10, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 19, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 14, "y": 6, "elevation": 3, @@ -172,4 +172,4 @@ "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15853D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index d84c669f7..97b012072 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index f9c5e37ec..cca7088ee 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 8, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index bbc4ebb00..549fe96df 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 1e0fe952d..7310a5ed5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 8, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 5, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_FANCLUB_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 3, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_FANCLUB_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 10, "y": 10, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 9eb06baa0..f66009546 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 4527b75c2..ba40fea8f 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 7, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 8, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 2, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 4, "y": 2, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 5, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 10, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 12, "y": 5, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 2, "y": 5, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_LINK_CONTEST_ROOM_POKEBALL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 7, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 6, "elevation": 3, @@ -210,4 +210,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index b5b6a92ce..870eeb331 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json index bc020148a..c018394a4 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/LinkContestRoom2/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json index 9a7446dad..2cd4ac89e 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/LinkContestRoom3/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json index efd3fbedb..0c1bd764f 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/LinkContestRoom4/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json index 042f5286e..c2360ee23 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/LinkContestRoom5/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json index e73501882..cc556b5ca 100644 --- a/data/maps/LinkContestRoom6/map.json +++ b/data/maps/LinkContestRoom6/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index f012ff56f..2a432f363 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -18,7 +18,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_3", "x": 16, "y": 10, "elevation": 3, @@ -31,7 +31,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 13, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_FAT_MAN_LITTLEROOT" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 14, "y": 17, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 5, "y": 8, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "FLAG_HIDE_MOM_LITTLEROOT" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 2, "y": 10, "elevation": 4, @@ -83,7 +83,7 @@ "flag": "FLAG_HIDE_MOVING_TRUCK_BRENDAN" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 11, "y": 10, "elevation": 4, @@ -236,4 +236,4 @@ "script": "LittlerootTown_EventScript_14D834" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index fa1ac38ad..166451028 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 2, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX", "x": 1, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_FACING_AWAY", "x": 4, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_BRENDAN_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -112,4 +112,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 40ef52b9a..bb38b7c46 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 0, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BRENDAN_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 0, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 4, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 0, "elevation": 0, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 1, "elevation": 0, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 3, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 4, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 5, "elevation": 0, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 7, "y": 1, "elevation": 3, @@ -238,4 +238,4 @@ "script": "LittlerootTown_BrendansHouse_2F_EventScript_152870" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index f2416f54c..15b502ef3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MAY_MOM_DOWNSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_FACING_AWAY", "x": 6, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX", "x": 9, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_MAY_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -112,4 +112,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index db982aaf5..8c1861439 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MAY_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 6, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 2, "y": 6, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 4, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 5, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 7, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 7, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 2, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 3, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 4, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 5, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 1, "y": 1, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_MOM_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL", "x": 3, "y": 4, "elevation": 4, @@ -251,4 +251,4 @@ "script": "LittlerootTown_MaysHouse_2F_EventScript_152C39" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 11681f61e..cef892407 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 9, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BIRCH_IN_LAB" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 3, @@ -190,4 +190,4 @@ "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 37996e6e8..b4df38381 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 19, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index 4a63a0bd8..e2b9bf84b 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 33, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 41, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 33, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -323,4 +323,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index 121b86c48..e1a03b59c 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 31, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 12, "y": 20, "elevation": 1, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 13, "y": 3, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 20, "elevation": 3, @@ -174,4 +174,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index fb3887037..deef6ac38 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 29, "y": 16, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 24, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 6, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 17, "y": 14, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 8, "y": 6, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "FLAG_HIDE_WALLY_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 6, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 29, "y": 9, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "FLAG_HIDE_WATTSON_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 19, "elevation": 3, @@ -268,4 +268,4 @@ "script": "MauvilleCity_EventScript_14C099" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 2d33f59b1..05872fbc9 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 7, "y": 6, "elevation": 3, @@ -73,4 +73,4 @@ "script": "MauvilleCity_BikeShop_EventScript_156988" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 710a912a2..f28ad929e 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 19, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 20, "y": 8, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 13, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 9, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 6, "elevation": 3, @@ -379,4 +379,4 @@ "script": "MauvilleCity_GameCorner_EventScript_1C40AC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index d68b4ac5b..e63936ff8 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 4, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WATTSON_MAUVILLE_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 6, "y": 9, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 2, "y": 15, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 20, "elevation": 3, @@ -153,4 +153,4 @@ "script": "MauvilleCity_Gym_EventScript_156771" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index ad7d843c0..ebf7c9319 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 58d88282f..2385d61b3 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 4, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 14e637a85..e4179a323 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index cf578fc29..551ad0e4d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 8, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 11, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 8, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index e8fca6505..d4a8e42ab 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 7, "elevation": 3, @@ -103,4 +103,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index d27e4ba7d..ab56a3c4f 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 20, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 21, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 6, "y": 20, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 6, "y": 20, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 6, "y": 21, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 23, "elevation": 3, @@ -208,4 +208,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 24c133810..4580e9b23 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 13, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 7, "y": 12, "elevation": 3, @@ -100,4 +100,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 2e7a33686..293d0da4f 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -57,4 +57,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 7fb77ab10..d1c02e53a 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 3a62d9ace..392e7ebd4 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 42, "y": 24, "elevation": 5, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 34, "elevation": 5, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 32, "y": 12, "elevation": 5, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 26, "y": 21, "elevation": 5, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 45, "y": 18, "elevation": 7, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 62, "y": 35, "elevation": 5, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 53, "y": 5, "elevation": 7, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 56, "y": 21, "elevation": 7, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 23, "y": 13, "elevation": 5, @@ -321,4 +321,4 @@ "script": "MossdeepCity_EventScript_14CFE4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index a06d123a8..1c79748c3 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ "script": "MossdeepCity_GameCorner_1F_EventScript_15AE4C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index b67e47009..8eda40f65 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 390abe349..72b0499c4 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TATE", + "graphics_id": "OBJ_EVENT_GFX_TATE", "x": 8, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 2, "y": 24, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 17, "y": 18, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 17, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 11, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 0, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 8, "y": 29, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LIZA", + "graphics_id": "OBJ_EVENT_GFX_LIZA", "x": 9, "y": 3, "elevation": 3, @@ -206,4 +206,4 @@ "script": "MossdeepCity_Gym_EventScript_15A80A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 5935872d6..fcb0a5455 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 85d4a3770..5a43747ff 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 4, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 4, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 897ce3fa0..b5f4dd201 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 27c0640f0..f7bafeb6a 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index d42689305..0cc9d7f28 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 1, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 5, "y": 3, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 467a5150b..4b8a9b59c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 8, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 3, "y": 5, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 89a6bfddc..bb0bd4786 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 6, "elevation": 3, @@ -103,4 +103,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 1f2d73745..f73363201 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 7, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index eed6b9e62..b2ddc566f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 5, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index f2659f369..1f3be9321 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 9, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_STEVEN_STEVENS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 4, "elevation": 3, @@ -115,4 +115,4 @@ "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 61497ff7d..f432ddc41 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 24, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 13, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 32, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 28, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 19, "y": 39, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 31, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 16, "y": 37, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 22, "y": 39, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 19, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 18, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 17, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 20, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 22, "y": 19, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 21, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 19, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 12, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 29, "y": 12, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 5, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 31, "y": 5, "elevation": 3, @@ -285,7 +285,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 15, "elevation": 3, @@ -298,7 +298,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 20, "y": 39, "elevation": 3, @@ -311,7 +311,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 21, "y": 39, "elevation": 3, @@ -324,7 +324,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 16, "y": 18, "elevation": 3, @@ -337,7 +337,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 7, "elevation": 3, @@ -350,7 +350,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 7, "elevation": 3, @@ -363,7 +363,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 27, "y": 17, "elevation": 3, @@ -425,4 +425,4 @@ "script": "MtChimney_EventScript_15D1DA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index e0bdbc99c..0fd291caa 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 5e96cc77f..5747b70d1 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 21, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 17, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 13, "y": 10, "elevation": 3, @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index fe048207c..dba85a8fa 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_MT_PYRE_2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 5, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 8, "elevation": 3, @@ -129,4 +129,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index aa22262f3..594e6bf08 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 1, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 12, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 3, @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index ce16ca88d..a47ced86c 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 98ac6cfc2..465ed07f7 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 3, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index aa7dcbb8b..f95bc310d 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 6, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 9, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index a7bebab0b..e58591664 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 40, "elevation": 3, @@ -126,4 +126,4 @@ "flag": "FLAG_HIDDEN_ITEM_4E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 1b6007fc3..c57858d45 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 22, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 23, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LEADER_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 23, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 25, "y": 15, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 11, "elevation": 3, @@ -187,4 +187,4 @@ "flag": "FLAG_HIDDEN_ITEM_50" } ] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 0d519bcd0..4162f2bfb 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -39,4 +39,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 787a05e2d..53f6cd305 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 25, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_5" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 18, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 10, "elevation": 3, @@ -283,4 +283,4 @@ "script": "NewMauville_Inside_EventScript_15E8E0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 5653cd4ad..55c96ca33 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 13, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 19, "elevation": 3, @@ -190,4 +190,4 @@ "script": "OldaleTown_EventScript_1A00E1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index cfae29190..51c124e99 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 792d74c52..e9e477ca1 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index d8d8d9154..5ef397b20 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index f33bfda02..5f27f1af7 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 7, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2797b36de..2da8b5347 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index a8cff836a..e2d2c51e0 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 23, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 11, "y": 14, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 9, "y": 16, "elevation": 3, @@ -133,4 +133,4 @@ "script": "PacifidlogTown_EventScript_1A00EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8593de30f..8d8f7872f 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index d63c501c4..c0ec16e14 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 1, "y": 7, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 1585a2133..b42480887 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 2, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 1d61f1cb8..20fdcc9f7 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index ea88241c2..541cac276 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 807c25cc7..629093f52 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 312f2debf..aaa4c37c9 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 700132ab2..f9e9029a1 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 18, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "FLAG_HIDE_WALLY_MOM_PETALBURG_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 15, "y": 10, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_WALLY_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 20, "y": 10, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 15, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 11, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_WALLY_MOTHER_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_ITEM_PETALBURG_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 28, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_ITEM_PETALBURG_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 15, "elevation": 3, @@ -288,4 +288,4 @@ "flag": "FLAG_HIDDEN_ITEM_5F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 92ee7ca46..f18ca8549 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 4, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_NORMAN_PETALBURG_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 94, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 81, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 42, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 55, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 68, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 29, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 109, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_GUIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 4, "y": 111, "elevation": 3, @@ -525,4 +525,4 @@ "script": "PetalburgCity_Gym_EventScript_1551BA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 975013262..306e3b6aa 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 54c64bd0f..795a86244 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 1c687123a..1cc632844 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 6, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index bc88e34fd..ac27f67a3 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 11, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 4, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 92c27f737..9f32c5995 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 924f08084..2eb5e8ce3 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 7, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index d93e6e2f7..619808a48 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 26, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 26, "y": 20, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_DEVON_PETALBURG_WOODS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 20, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 8, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 15, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 32, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 14, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 30, "y": 34, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_4" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 33, "y": 5, "elevation": 3, @@ -295,4 +295,4 @@ "script": "PetalburgWoods_EventScript_15CF1E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 9170a1bbe..513fe058c 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 10, "y": 5, "elevation": 3, @@ -94,4 +94,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index cd5cf9c6c..58f046257 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 16, "y": 8, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 13, "elevation": 0, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_BIRCH_BATTLE_POOCHYENA" }, { - "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", "x": 7, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_HIDE_BIRCH_STARTERS_BAG" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 10, "y": 13, "elevation": 0, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_POOCHYENA_ROUTE101" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 5, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_BIRCH_ROUTE101" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 13, "elevation": 3, @@ -195,4 +195,4 @@ "script": "Route101_EventScript_14EA76" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 8a270897c..a08922258 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 18, "y": 11, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 14, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 15, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 37, "y": 4, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 15, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_ITEM_ROUTE102_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 2, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 4, "elevation": 3, @@ -160,4 +160,4 @@ "script": "Route102_EventScript_14EAE3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 6b2419465..02f9b30c3 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 49, "y": 12, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE103" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 71, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 65, "y": 11, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 64, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 50, "y": 8, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 58, "y": 5, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 59, "y": 5, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 60, "y": 5, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 20, "y": 10, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 7, "y": 3, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_BIRCH_ROUTE103" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 56, "y": 12, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 63, "y": 8, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_ITEM_ROUTE103_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 67, "y": 7, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 69, "y": 7, "elevation": 3, @@ -230,4 +230,4 @@ "script": "Route103_EventScript_14ED8B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 3be9b9c9d..402186fe0 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 60, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 25, "y": 49, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 31, "y": 24, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 27, "y": 63, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 30, "y": 50, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 28, "y": 74, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 54, "elevation": 1, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 51, "elevation": 4, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 29, "y": 8, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 6, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 6, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 41, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 41, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 41, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 37, "y": 8, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 22, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 23, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 24, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 25, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 15, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_ITEM_ROUTE104_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 8, "y": 19, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 27, "y": 15, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 28, "y": 15, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 11, "y": 44, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 22, "y": 25, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_ITEM_ROUTE104_2" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 67, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 22, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_ITEM_ROUTE104_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 22, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 8, "elevation": 3, @@ -431,7 +431,7 @@ "flag": "FLAG_ITEM_ROUTE104_4" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 26, "elevation": 3, @@ -585,4 +585,4 @@ "flag": "FLAG_HIDDEN_ITEM_58" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 55e841a63..c63adc21d 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 6dbcdeb34..43be93d0c 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 11, "y": 6, "elevation": 4, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index ba74f5320..5d3ecfb4a 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 27, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 13, "y": 9, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 13, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 25, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 16, "y": 30, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 34, "y": 2, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 14, "y": 4, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 27, "y": 29, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 26, "y": 29, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 17, "y": 37, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 28, "elevation": 3, @@ -196,4 +196,4 @@ "script": "Route104_Prototype_EventScript_160D25" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 3b43b7439..98e93f16a 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 2, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 9b23945b3..9a4119af2 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 60, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 10, "y": 44, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 26, "y": 36, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 19, "y": 9, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 73, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE105_1" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 51, "elevation": 3, @@ -121,4 +121,4 @@ "flag": "FLAG_HIDDEN_ITEM_59" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 72ecc9cd7..db91a4888 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 29, "y": 11, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 5, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 51, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 65, "y": 14, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 14, "elevation": 3, @@ -132,4 +132,4 @@ "script": "Route106_EventScript_14F32F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 9d92a48c6..38aeaa80a 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 27, "y": 10, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 38, "y": 11, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 50, "y": 6, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 16, "y": 11, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 4, "elevation": 1, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 32, "y": 4, "elevation": 1, @@ -104,4 +104,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 505462bb1..c4589064e 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 17, "y": 13, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 6, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 50, "y": 10, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 36, "y": 12, "elevation": 1, @@ -95,4 +95,4 @@ "flag": "FLAG_HIDDEN_ITEM_56" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index f6ba28567..520b0590a 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 21, "y": 26, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 24, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE109" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 12, "y": 36, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 25, "y": 42, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 19, "y": 19, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 11, "elevation": 4, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 21, "y": 11, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 8, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 11, "y": 6, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 48, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE109_1" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 29, "y": 32, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 31, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 15, "y": 52, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 24, "y": 17, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 25, "y": 17, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 30, "y": 32, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 41, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 9, "y": 41, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 33, "y": 6, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 32, "y": 6, "elevation": 3, @@ -359,4 +359,4 @@ "flag": "FLAG_HIDDEN_ITEM_5B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index f13c989a7..f5ab2fc3b 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 14, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 39771ce64..900b7b0e9 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 17, "y": 90, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 29, "y": 79, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 14, "y": 69, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 9, "y": 57, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 27, "y": 24, "elevation": 4, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 15, "y": 7, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 16, "y": 73, "elevation": 4, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 31, "elevation": 4, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 30, "y": 31, "elevation": 4, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 16, "y": 55, "elevation": 4, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 5, "y": 39, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 15, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 23, "y": 40, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 10, "y": 19, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 11, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 11, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 11, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 69, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_ITEM_ROUTE110_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 47, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_ITEM_ROUTE110_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 27, "y": 92, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 7, "y": 83, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 83, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 83, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 10, "y": 83, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 82, "elevation": 0, @@ -366,7 +366,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 21, "y": 78, "elevation": 4, @@ -379,7 +379,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 34, "y": 54, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 34, "y": 54, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 69, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 73, "elevation": 3, @@ -658,4 +658,4 @@ "script": "Route110_EventScript_14F9E6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 9cbe4c81e..f5aa399d1 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, @@ -76,4 +76,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index ab14ffdb0..1c101fb14 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, @@ -76,4 +76,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 027edb4dc..116e0994d 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 588dd24c6..fb2b69f8d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -62,4 +62,4 @@ "flag": "FLAG_HIDDEN_ITEM_1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 115382d52..91fe0ca4d 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 2, "elevation": 3, @@ -96,4 +96,4 @@ "script": "Route110_TrickHouseEntrance_EventScript_16158A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 328d1130c..7e751f290 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 21, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 3, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 7, "y": 21, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 12, "y": 18, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 10, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 12, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 3, "y": 12, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 14, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 6, "y": 10, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 9, "y": 8, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 4, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 6, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 6, "y": 4, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 4, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 12, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 14, "y": 14, "elevation": 3, @@ -293,4 +293,4 @@ "script": "Route110_TrickHousePuzzle1_EventScript_161D14" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index a06a5713a..f7cbe12c5 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 16, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 0, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 19, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 2, "elevation": 3, @@ -148,4 +148,4 @@ "script": "Route110_TrickHousePuzzle2_EventScript_161DC3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index e938dbea0..09e65aab2 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 16, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 1, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 21, "elevation": 3, @@ -253,4 +253,4 @@ "script": "Route110_TrickHousePuzzle3_EventScript_1626EB" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 383bd64da..43e1e81f6 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 2, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 8, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 13, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 2, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 9, "elevation": 3, @@ -241,4 +241,4 @@ "script": "Route110_TrickHousePuzzle4_EventScript_16274E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index feb75a963..9ce88d3b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 12, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 12, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 1, "y": 6, "elevation": 3, @@ -238,4 +238,4 @@ "script": "Route110_TrickHousePuzzle5_EventScript_1627D5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 289c15127..a6394d018 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 14, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 0, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 2, "elevation": 3, @@ -98,4 +98,4 @@ "script": "Route110_TrickHousePuzzle6_EventScript_1630EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index c599fd181..373b30748 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 9, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 10, "elevation": 3, @@ -148,4 +148,4 @@ "script": "Route110_TrickHousePuzzle7_EventScript_163375" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 58fd42a74..936925f86 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 12, "y": 21, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 12, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -98,4 +98,4 @@ "script": "Route110_TrickHousePuzzle8_EventScript_16341C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index a759b157c..5a5c23e2e 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 13, "y": 114, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_VICTOR_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 13, "y": 113, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_VICTORIA_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 113, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_VIVI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 13, "y": 113, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_VICKI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 51, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 91, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 24, "y": 60, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 69, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 21, "y": 47, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 32, "y": 72, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 101, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 100, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 23, "y": 8, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 105, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_ITEM_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 54, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_ITEM_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 114, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "FLAG_ITEM_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 22, "y": 21, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 82, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 71, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 32, "y": 29, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 11, "y": 12, "elevation": 3, @@ -431,7 +431,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 27, "elevation": 3, @@ -444,7 +444,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 20, "elevation": 3, @@ -457,7 +457,7 @@ "flag": "FLAG_HIDE_SECRET_POWER_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 32, "y": 38, "elevation": 3, @@ -470,7 +470,7 @@ "flag": "FLAG_HIDE_ROOT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 33, "y": 38, "elevation": 3, @@ -483,7 +483,7 @@ "flag": "FLAG_HIDE_CLAW_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 20, "y": 114, "elevation": 3, @@ -957,4 +957,4 @@ "flag": "FLAG_HIDDEN_ITEM_39" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 1359d68cc..8269b34f6 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 6, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index a66ac4543..3241998c5 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 4, "y": 4, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index b2eef42bc..e6876a2d9 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 26, "y": 30, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 24, "y": 34, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 49, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 46, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 40, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 27, "y": 30, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 27, "y": 6, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 28, "y": 6, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 6, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 50, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 43, "elevation": 3, @@ -255,4 +255,4 @@ "script": "Route112_EventScript_150537" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index c6ed9d9a8..3f9a7377e 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 3a03a4f74..8a49c686c 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 66, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 36, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 62, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 21, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 51, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 7, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_ROUTE113_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 78, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_ITEM_ROUTE113_2" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 66, "y": 3, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 29, "y": 6, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 45, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 46, "y": 6, "elevation": 3, @@ -372,4 +372,4 @@ "flag": "FLAG_HIDDEN_ITEM_1E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 25b73fcff..5e8e6d5a9 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 5, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index c72be9b6f..9980ae967 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 43, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 44, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 65, "elevation": 7, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 72, "elevation": 5, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 22, "y": 50, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 35, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 20, "y": 56, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 45, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_ITEM_ROUTE114_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 37, "elevation": 4, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE114_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 43, "elevation": 4, @@ -166,7 +166,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 19, "y": 11, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 19, "y": 12, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 27, "y": 42, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 23, "y": 20, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 19, "y": 26, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 30, "y": 58, "elevation": 5, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 53, "elevation": 5, @@ -257,7 +257,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 30, "y": 54, "elevation": 5, @@ -270,7 +270,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 22, "y": 69, "elevation": 7, @@ -283,7 +283,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 64, "elevation": 5, @@ -296,7 +296,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 24, "y": 44, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 23, "y": 44, "elevation": 3, @@ -437,4 +437,4 @@ "flag": "FLAG_HIDDEN_ITEM_2A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 58d91f253..fc6608a89 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 3, "y": 2, "elevation": 3, @@ -83,4 +83,4 @@ "script": "Route114_FossilManiacsHouse_EventScript_15C205" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index bbd151d1d..7a7f76711 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index f959007e4..abde113c6 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 4, "elevation": 3, @@ -68,4 +68,4 @@ "script": "Route114_LanettesHouse_EventScript_15C2D5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 98588d46f..cc2f976d9 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 18, "y": 68, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 15, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 27, "y": 53, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 13, "y": 5, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 50, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 17, "y": 17, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 25, "y": 61, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 60, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE115_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 5, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_ITEM_ROUTE115_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 29, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_ITEM_ROUTE115_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 64, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 65, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 50, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 56, "elevation": 3, @@ -344,4 +344,4 @@ "flag": "FLAG_HIDDEN_ITEM_61" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 615b94d98..8e466e012 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 2, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 7, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 21, "y": 6, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 33, "y": 8, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 13, "y": 17, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 6, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_ITEM_ROUTE116_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 17, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_ITEM_ROUTE116_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 20, "y": 2, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 21, "y": 2, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 46, "y": 9, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_BRINEY_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 30, "y": 6, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 15, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 24, "y": 9, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 80, "y": 8, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_ITEM_ROUTE116_4" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 22, "y": 16, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 25, "y": 4, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 31, "y": 9, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 46, "y": 11, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 56, "y": 12, "elevation": 4, @@ -283,7 +283,7 @@ "flag": "FLAG_ITEM_ROUTE116_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 38, "y": 9, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_HIDE_TUNNER_DIGGER_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 74, "y": 13, "elevation": 3, @@ -429,4 +429,4 @@ "flag": "FLAG_HIDDEN_ITEM_BLACK_GLASSES" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index d298eedd1..f5927d4b0 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 2, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 09336cb04..58f8875a2 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 13, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 26, "y": 13, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 47, "y": 4, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 33, "y": 3, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 39, "y": 4, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 42, "y": 2, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 49, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 35, "y": 7, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 31, "y": 11, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 9, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 41, "y": 13, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 42, "y": 13, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 43, "y": 13, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_ITEM_ROUTE117_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 2, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 1, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_ITEM_ROUTE117_2" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 21, "y": 1, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 12, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 46, "y": 15, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 45, "y": 15, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 48, "y": 10, "elevation": 3, @@ -340,4 +340,4 @@ "flag": "FLAG_HIDDEN_ITEM_48" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 02b70db9c..abf33dae3 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 2, "y": 2, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 2ec9a3578..e5c9690e3 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 37, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 64, "y": 10, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 12, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 38, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 8, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 10, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 14, "y": 14, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 56, "y": 7, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 39, "y": 15, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 17, "y": 11, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 44, "y": 7, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE118" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 69, "y": 7, "elevation": 3, @@ -387,4 +387,4 @@ "flag": "FLAG_HIDDEN_ITEM_42" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 74b0263ae..65f784333 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 5, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 5, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 26, "y": 5, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 123, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 26, "y": 123, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 125, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 74, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 116, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 83, "elevation": 4, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 34, "y": 122, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 17, "y": 128, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 28, "y": 16, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 19, "y": 49, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 10, "y": 50, "elevation": 4, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 8, "y": 62, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 25, "y": 32, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE119" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 121, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "FLAG_ITEM_ROUTE119_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 96, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_ITEM_ROUTE119_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_ITEM_ROUTE119_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 76, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_ITEM_ROUTE119_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 18, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_ITEM_ROUTE119_5" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 117, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE119_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 33, "elevation": 4, @@ -322,7 +322,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 34, "elevation": 4, @@ -335,7 +335,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 17, "y": 33, "elevation": 4, @@ -348,7 +348,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 31, "y": 109, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 8, "y": 23, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 23, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 90, "elevation": 3, @@ -400,7 +400,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 90, "elevation": 3, @@ -413,7 +413,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 133, "elevation": 3, @@ -426,7 +426,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 56, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "FLAG_ITEM_ROUTE119_7" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 35, "y": 93, "elevation": 4, @@ -452,7 +452,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 29, "y": 6, "elevation": 3, @@ -465,7 +465,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 31, "y": 6, "elevation": 3, @@ -478,7 +478,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE119_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 13, "elevation": 4, @@ -491,7 +491,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE119_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 104, "elevation": 3, @@ -850,4 +850,4 @@ "script": "Route119_EventScript_151605" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 471d9c40f..7c5395d29 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 1, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 0, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 8, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 5, "y": 3, "elevation": 3, @@ -121,4 +121,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 048366667..ef0477682 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 2, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 14, "y": 11, "elevation": 3, @@ -135,4 +135,4 @@ "script": "Route119_WeatherInstitute_1F_EventScript_163C83" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 9d59bb48d..2893c39e8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 10, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 4, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 0, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 7, "elevation": 3, @@ -101,4 +101,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index f8d8e334d..c9a163922 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 4, "y": 79, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 79, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 79, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 79, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 24, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 24, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 24, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 92, "elevation": 5, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 10, "y": 92, "elevation": 5, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 92, "elevation": 5, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 5, "y": 22, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 32, "y": 14, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 27, "y": 51, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 36, "y": 45, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 19, "y": 80, "elevation": 5, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 55, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_ITEM_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 32, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 89, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 92, "elevation": 5, @@ -322,7 +322,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 28, "y": 35, "elevation": 3, @@ -335,7 +335,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 60, "elevation": 3, @@ -348,7 +348,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 16, "y": 6, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 18, "y": 34, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 13, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "FLAG_ITEM_ROUTE120_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 82, "elevation": 5, @@ -400,7 +400,7 @@ "flag": "FLAG_ITEM_ROUTE120_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 12, "y": 16, "elevation": 4, @@ -413,7 +413,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 13, "y": 15, "elevation": 4, @@ -426,7 +426,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE120" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 20, "y": 1, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 1, "elevation": 3, @@ -452,7 +452,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 10, "y": 72, "elevation": 3, @@ -465,7 +465,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 19, "y": 28, "elevation": 3, @@ -478,7 +478,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_2", "x": 12, "y": 16, "elevation": 3, @@ -491,7 +491,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 11, "elevation": 3, @@ -504,7 +504,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 27, "y": 2, "elevation": 3, @@ -517,7 +517,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_4" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 77, "elevation": 3, @@ -530,7 +530,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_5" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 7, "y": 51, "elevation": 3, @@ -543,7 +543,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_7" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 19, "y": 48, "elevation": 3, @@ -813,4 +813,4 @@ "secret_base_id": "SECRET_BASE_SHRUB1_4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 8fb438a87..de0def82e 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 29, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 16, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 2, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 64, "y": 14, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 65, "y": 14, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 66, "y": 14, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 67, "y": 14, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 9, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 9, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 7, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 31, "y": 7, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 5, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 65, "y": 4, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 63, "y": 5, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 55, "y": 8, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 10, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 22, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 10, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_ITEM_ROUTE121_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 26, "y": 12, "elevation": 3, @@ -431,4 +431,4 @@ "flag": "FLAG_HIDDEN_ITEM_49" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 9664da26a..1bde0de82 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 17, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 2, "elevation": 3, @@ -102,4 +102,4 @@ "script": "Route121_SafariZoneEntrance_EventScript_15C487" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 5f98fcab7..1037df207 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -33,4 +33,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index bfbb21685..3d7914161 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 3, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 3, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 3, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 3, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 81, "y": 1, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 82, "y": 1, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 83, "y": 1, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 70, "y": 12, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 58, "y": 7, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 5, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 5, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 5, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 3, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 3, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 101, "y": 13, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 129, "y": 14, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 92, "y": 9, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 8, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_ITEM_ROUTE123_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 139, "y": 18, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE123_2" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 108, "y": 13, "elevation": 3, @@ -322,7 +322,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 109, "y": 13, "elevation": 3, @@ -335,7 +335,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 110, "y": 13, "elevation": 3, @@ -348,7 +348,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 111, "y": 13, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 16, "y": 9, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 38, "y": 13, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 37, "y": 13, "elevation": 3, @@ -400,7 +400,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 138, "y": 12, "elevation": 3, @@ -413,7 +413,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 50, "y": 16, "elevation": 3, @@ -426,7 +426,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 87, "y": 14, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 18, "elevation": 3, @@ -452,7 +452,7 @@ "flag": "FLAG_ITEM_ROUTE123_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 75, "y": 9, "elevation": 3, @@ -701,4 +701,4 @@ "flag": "FLAG_HIDDEN_ITEM_4A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 60abf6aec..2de87d68a 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 0c2746806..07c6c35ac 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -38,7 +38,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 58, "y": 59, "elevation": 1, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 33, "y": 25, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 14, "y": 27, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 49, "y": 45, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 60, "y": 74, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_ITEM_ROUTE124_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 53, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_ITEM_ROUTE124_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 11, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_ITEM_ROUTE124_1" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 44, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 17, "y": 44, "elevation": 1, @@ -188,4 +188,4 @@ "script": "Route124_EventScript_151DEF" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 90f82b109..365faa9d2 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 5, "y": 4, "elevation": 0, @@ -52,4 +52,4 @@ "script": "Route124_DivingTreasureHuntersHouse_EventScript_164335" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index daa715f90..1257bc3f3 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 46, "y": 9, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 9, "y": 32, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 31, "y": 33, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 39, "y": 20, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 28, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 20, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 21, "y": 21, "elevation": 3, @@ -154,4 +154,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 568a30c4d..0b1f067d0 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 55, "y": 22, "elevation": 1, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 33, "y": 63, "elevation": 1, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 49, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 64, "y": 44, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -96,4 +96,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index d7aeede26..cf1d10919 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 68, "elevation": 1, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 44, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 7, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "FLAG_ITEM_ROUTE127_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 39, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_ITEM_ROUTE127_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 53, "y": 13, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 52, "y": 25, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 64, "y": 19, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 12, "y": 18, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 63, "y": 63, "elevation": 3, @@ -189,4 +189,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index f660ca061..ffeeea577 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 77, "y": 24, "elevation": 1, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 40, "y": 22, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 37, "y": 22, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_HIDE_EVIL_LEADER_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 38, "y": 21, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "FLAG_HIDE_OTHER_LEADER_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 63, "y": 28, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 24, "y": 8, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 47, "y": 9, "elevation": 3, @@ -165,4 +165,4 @@ "flag": "FLAG_HIDDEN_ITEM_5E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 2e82703ce..49c90b05f 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 15, "y": 23, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 9, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 14, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 28, "y": 16, "elevation": 1, @@ -78,4 +78,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 9dee253e1..050f1dd3b 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 26, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 22, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 52, "y": 9, "elevation": 3, @@ -65,4 +65,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index cedfcb2a5..b8475d8e7 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 17, "y": 25, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 36, "y": 26, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 28, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 23, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 16, "elevation": 1, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 8, "y": 16, "elevation": 1, @@ -112,4 +112,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 0bbc25537..126e33093 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 3, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 41, "y": 16, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 11, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_ITEM_ROUTE132_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 46, "y": 28, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 9, "y": 16, "elevation": 3, @@ -91,4 +91,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index d0f5c04a1..a62b50133 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 6, "y": 4, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 24, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 69, "y": 24, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 15, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_ITEM_ROUTE133_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE133_2" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 37, "y": 16, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 14, "elevation": 3, @@ -117,4 +117,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 1db9b4559..13cef0f1b 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 9, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 5, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 41, "y": 23, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 65, "y": 14, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 56, "y": 16, "elevation": 3, @@ -91,4 +91,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index eed60f018..f08944375 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 22, "y": 34, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 25, "y": 37, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 21, "y": 46, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 45, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 26, "y": 23, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 24, "y": 51, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 25, "y": 51, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 30, "y": 10, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_DEVON_RUSTBORO" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 21, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GRUNT_RUSTBORO" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 13, "y": 34, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 51, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_ITEM_RUSTBORO_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 19, "y": 27, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 16, "y": 50, "elevation": 3, @@ -497,4 +497,4 @@ "script": "RustboroCity_EventScript_14C440" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index d3de8eede..275bbdf3f 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 2, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 8958b1f0d..79c98cb82 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 2, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 15, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 5, "y": 3, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index fa0083821..366aa436f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 8, "elevation": 3, @@ -95,4 +95,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index f0ee24e39..cf7d992ee 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 15, "y": 5, "elevation": 3, @@ -79,4 +79,4 @@ "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index c31c09f47..d8e7ffa22 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 12, "y": 4, "elevation": 3, @@ -63,4 +63,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 357559246..b262445ea 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 6, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index e458782d3..1477e2433 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 11, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -63,4 +63,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 08c2f98b6..c99e411c5 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 11, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 1bc864ba9..5a5be9a55 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 7, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 2, "elevation": 3, @@ -49,4 +49,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 2593b63a1..e20a3125b 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "graphics_id": "OBJ_EVENT_GFX_ROXANNE", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 17, "elevation": 3, @@ -99,4 +99,4 @@ "script": "RustboroCity_Gym_EventScript_1579BD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index d0a4a6952..5886df257 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 2, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index bb13d157c..32e0585bc 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 4, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 4c85ea665..5aa5ad3cb 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index b8ec482f2..ddd770acc 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 8, "y": 2, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 84658ac3d..0db82f965 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 3, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index b15b76dee..d4c0a47f8 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index c313a32a8..c83fe43e1 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 8, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 9, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 3, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 3, "elevation": 3, @@ -149,4 +149,4 @@ "script": "RustboroCity_PokemonSchool_EventScript_157AC5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 735f458e9..517180038 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 4, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_BRINEY_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNT_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 14, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_PEEKO_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 4, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 13, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 25, "y": 4, "elevation": 3, @@ -213,4 +213,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 96a71a548..a9dc2e319 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 7, "y": 2, "elevation": 3, @@ -228,4 +228,4 @@ "script": "SSTidalCorridor_EventScript_15FDCD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 32427e217..2d39a4738 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 7, "y": 4, "elevation": 3, @@ -58,4 +58,4 @@ "flag": "FLAG_HIDDEN_ITEM_23" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index dae890edb..26b8ea700 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 34, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 21, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 22, "y": 11, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 5, "elevation": 3, @@ -221,4 +221,4 @@ "script": "SSTidalRooms_EventScript_15FF47" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index b55b4b17d..162bab045 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 22, "y": 9, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 6, "y": 29, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 13, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 28, "y": 14, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 23, "y": 6, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 7, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 27, "y": 7, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -143,4 +143,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 7ce5e066a..a978577ff 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 8, "elevation": 5, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 7, "elevation": 3, @@ -52,4 +52,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index 75441b275..e1e4f1376 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 4, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 8, "y": 4, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 4a221659e..c21f3a5ee 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 32, "y": 34, "elevation": 4, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 26, "y": 28, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 6, "elevation": 5, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 15, "y": 31, "elevation": 3, @@ -86,4 +86,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index aa8783ee7..149fb1d6d 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 22, "y": 9, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 37, "elevation": 3, @@ -69,4 +69,4 @@ "script": "SafariZone_Southwest_EventScript_16002D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 21620a3ff..d77f55591 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 0aadf9e82..36b4b7c67 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index a112c7687..1ff3e10d6 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 10, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index bfaaa3348..6f118a1b6 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 14, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 9, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 15, "y": 11, "elevation": 3, @@ -161,4 +161,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index c2e2e3ecf..f31764448 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 9, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 5, "elevation": 3, @@ -167,4 +167,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 98bd188b9..28f00360b 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 8, "elevation": 3, @@ -57,4 +57,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 111cbb4cd..85ba5add7 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 8, "elevation": 3, @@ -115,4 +115,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index b94b49f3f..a554c7531 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 2ec32dfe6..700c3107f 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 0025aa4ff..4c143b175 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 5, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 4, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 4, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 4, "elevation": 3, @@ -186,4 +186,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 922ca110b..e308633ec 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 17, "y": 38, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 9, "y": 42, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 9, "y": 42, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 8, "y": 41, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 8, "y": 42, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 17, "y": 38, "elevation": 3, @@ -124,4 +124,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index f7665694e..585bb90d0 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -95,4 +95,4 @@ "script": "SealedChamber_InnerRoom_EventScript_15F1E8" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index f689c055d..c2c74b930 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -255,4 +255,4 @@ "script": "SealedChamber_OuterRoom_EventScript_15F1D9" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index b537b704e..1100ada56 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 52c57c24b..8b3b35721 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 09728d252..11ab94ef5 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 50ee51d18..ce0338ac4 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index cb5e4a4ad..4df7c9b36 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 14970984c..f96c7ac37 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 11, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 2bf0b85f3..b1c136f37 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 3430a9beb..348b19024 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 5d07a9a75..8ef1182dc 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index a9aede8fe..9746434b2 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index b7540e17e..4ea1ae21f 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 12, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 8e2720d9e..458d8e469 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index e026ff3c4..4b314b856 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index c74be4345..10463cf97 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 13, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index b31391a90..cbbf64305 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index adab91085..487c0f09f 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 643829a91..9fcb78bc3 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 943cca9d4..b7c0da914 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 6120fc2a5..349e340eb 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 40cffa28f..c6c0856cf 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 10, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 3c9a7af7c..ab18d10de 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index e88ca5209..07481867c 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index ab9b876b7..d1060d26d 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 0fbff9fb6..f717b2c88 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index c6d66b6c3..3ae268fa1 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -14,4 +14,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index 7226401ef..ef1f1487c 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -14,4 +14,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 51848cfb4..cb85bc9d3 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 18, "y": 15, "elevation": 3, @@ -70,4 +70,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index e0f2701b5..614b0bd45 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 21, "elevation": 4, @@ -49,4 +49,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 8b9fbc81e..cb71337b8 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 14, "elevation": 5, @@ -134,4 +134,4 @@ "script": "ShoalCave_LowTideInnerRoom_EventScript_15E2F7" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 4488b4dfa..4caad9c19 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 25, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 4, "elevation": 3, @@ -79,4 +79,4 @@ "script": "ShoalCave_LowTideLowerRoom_EventScript_15E413" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 315d7b271..945c23cf5 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -52,4 +52,4 @@ "script": "ShoalCave_LowTideStairsRoom_EventScript_15E3B7" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index e961fcfc2..8d401f04f 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 9, "y": 3, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index dee61d817..dc120c3b6 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index a46aea2de..9dc7b05de 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 02ade47fd..712c1c490 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 2c6b535ea..7d25f8c81 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 3aff1cb3a..007456bfc 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 8a2810482..d0d984329 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 1985cc5e2..1d5b0d633 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index f64a9bf89..edb7cb344 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA", "x": 14, "y": 6, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 1207a96fd..537b4fbd3 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 35, "y": 27, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 15, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 26, "y": 29, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 31, "y": 27, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 5, "y": 43, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 20, "y": 37, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 42, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 29, "y": 13, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 28, "y": 14, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 28, "y": 13, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_STERN_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 35, "y": 36, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 28, "y": 46, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 50, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 16, "y": 46, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 18, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 24, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 15, "y": 31, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 27, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 29, "y": 27, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 38, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 5, "y": 51, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 34, "y": 51, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 47, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 11, "y": 47, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_TM_SALESMAN_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 47, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 22, "y": 27, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 27, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 24, "y": 27, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 26, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 26, "elevation": 3, @@ -609,4 +609,4 @@ "script": "SlateportCity_EventScript_14BC3C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index a6c98a621..1b5592f22 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index e9d393dc4..6084fcd54 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 15, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 1, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 12, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 9, "y": 11, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 5, "y": 10, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 0, "y": 17, "elevation": 3, @@ -216,4 +216,4 @@ "script": "SlateportCity_ContestHall_EventScript_155671" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 9daed7053..bcb51b116 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 0, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 9, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 1, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 2, "elevation": 3, @@ -174,4 +174,4 @@ "script": "SlateportCity_ContestLobby_EventScript_15908D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 9dce77426..43aa2334c 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_STERN_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 7, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 8, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 7, "y": 9, "elevation": 1, @@ -185,4 +185,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index 795ccbcbe..596a3c7ad 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index 0cbf020dc..93ff24a83 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index e9d3cf528..cf4541605 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index d2cbbf046..7e88562c9 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 7, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 18, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 3, "y": 4, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 17, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 18, "y": 8, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 4, "elevation": 3, @@ -343,4 +343,4 @@ "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C0D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 9a1696b6e..0495e2b3c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 02de2a32f..578249d64 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 6, "y": 1, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 1, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 1, "y": 3, "elevation": 3, @@ -283,4 +283,4 @@ "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 1c4799881..67c8eb1e3 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 7, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 8b6acc885..0b97403b1 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index ea2e9c2dd..0226b2688 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 4, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 1, "y": 5, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 5, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 4, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 3, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 8, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 10, "y": 8, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index fc07ddcc4..d506e68aa 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 11, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index c7e9f2f69..75caaada4 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 9, "elevation": 3, @@ -62,4 +62,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 74f275db9..6a7d8bda2 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -12,7 +12,7 @@ "connections": [], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 20, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 33, "y": 20, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 47, "y": 42, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 32, "y": 21, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 9, "y": 43, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 51, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 43, "y": 26, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 30, "y": 21, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_STEVEN_SOOTOPOLIS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 49, "y": 34, "elevation": 3, @@ -302,4 +302,4 @@ "script": "SootopolisCity_EventScript_14D2F6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 90afefed7..541c548a1 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 24, "elevation": 3, @@ -80,4 +80,4 @@ "script": "SootopolisCity_Gym_1F_EventScript_15B0B3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 37b40f491..1c1f356e7 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -127,4 +127,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index b66dd5768..2bf4bd5ef 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 2, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 0b4ffb2d6..608a9a9bb 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 3, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index d2a01f18e..915a3b63a 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index f68c71213..33dd96c46 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 32bf9dc1f..dd424dcf1 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 586979fcf..b7c3a0874 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 796901032..9d98555d9 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index e645c2dd5..d4bc31546 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, @@ -73,4 +73,4 @@ "script": "SootopolisCity_House8_EventScript_15B531" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index bb2231ba1..36435f04c 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index bed5ed911..944e7afda 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 7, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 134e3d67b..83f4627fc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 9863ed343..abac82272 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 23, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 25, "elevation": 1, @@ -65,4 +65,4 @@ "script": "SouthernIsland_Exterior_EventScript_160B4A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 0c925de3f..80c109755 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 12, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_LATIOS_OR_LATIAS_FLYING" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 2, "elevation": 0, @@ -65,4 +65,4 @@ "script": "SouthernIsland_Interior_EventScript_160B9B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 4183964ba..1cd1d6f13 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -13,9 +13,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIOS .else - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -29,11 +29,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index a3351b84f..f80e362be 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 9, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index 4315d5adf..b5da6e8f3 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -82,4 +82,4 @@ "flag": "FLAG_HIDDEN_ITEM_26" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 317a9aaa0..19bb67c63 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -103,4 +103,4 @@ "flag": "FLAG_HIDDEN_ITEM_C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 20b8acfe9..5166a403c 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -63,4 +63,4 @@ "flag": "FLAG_HIDDEN_ITEM_18" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index ce04b09ea..a963da647 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -50,4 +50,4 @@ "flag": "FLAG_HIDDEN_ITEM_1A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index 53d5ee607..d435556ee 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -22,4 +22,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index cd02aeebd..030de2c7e 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 4, "elevation": 3, @@ -75,4 +75,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 109e01432..4a31edb43 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -31,4 +31,4 @@ "script": "Underwater_SealedChamber_EventScript_15F0B8" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index a0cadda64..8250b2a32 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json index 83ca5ce0c..eba4d0b48 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownMap_25_29/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json index c43f27759..4a8343163 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownMap_25_30/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json index a4dc2582a..932a48899 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownMap_25_31/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json index 2f1000c45..32d15dbdc 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownMap_25_32/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json index e0a3cd273..14d6589b6 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownMap_25_33/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json index 7db383760..b4d5c7bab 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownMap_25_34/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 56da57485..c79294e3a 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 17, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 9, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 9, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 6, "y": 10, "elevation": 3, @@ -193,4 +193,4 @@ "script": "VerdanturfTown_EventScript_14E8E5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 9a8c4abe3..80225a30d 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 0, "y": 7, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 20, "y": 15, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 9, "y": 8, "elevation": 3, @@ -86,4 +86,4 @@ "script": "VerdanturfTown_ContestHall_EventScript_153EB2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index a6a1b79fe..feb2dfbed 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 14, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_VERDANTURF" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 0, "y": 3, "elevation": 3, @@ -148,4 +148,4 @@ "script": "VerdanturfTown_ContestLobby_EventScript_153E89" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 52ef96351..21d102b64 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index 1a345f0e7..dacece217 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index ff9a09f9d..367f8e510 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 2, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 5bf660e2d..41945575a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 2, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index 8850238f5..c5dddc69c 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 57b32a20c..599bfe697 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 14, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WALLY_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -95,4 +95,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d7e721397..c26c4fc51 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 33, "y": 22, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 6, "y": 15, "elevation": 4, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 27, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 39, "elevation": 4, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 9, "elevation": 3, @@ -179,4 +179,4 @@ "flag": "FLAG_HIDDEN_ITEM_51" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index a833aaea5..a33cf522a 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 25, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 5, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 12, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 25, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 21, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 34, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 37, "y": 12, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 26, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 21, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 34, "y": 3, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_VICTORY_ROAD_ROCK" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 8, "elevation": 4, @@ -246,7 +246,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 3, "elevation": 3, @@ -312,4 +312,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index a8d0480ca..58f5d73fc 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 15, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 43, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 2, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 35, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 8, "elevation": 3, @@ -126,4 +126,4 @@ "flag": "FLAG_HIDDEN_ITEM_53" } ] -}
\ No newline at end of file +} diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e804c8968..8b455060d 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -557,4 +557,4 @@ "SafariZone_Southwest", "SafariZone_Southeast" ] -}
\ No newline at end of file +} diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 17897223a..1a72316bc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ S_BerryTree:: @ 81A14DD - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData switch VAR_0x8004 case 255, BerryTree_EventScript_1A1533 case 0, BerryTree_EventScript_1A153D @@ -107,10 +107,10 @@ BerryTree_EventScript_1A15F9:: @ 81A15F9 goto_if_eq BerryTree_EventScript_1A164B BerryTree_EventScript_1A161D:: @ 81A161D - special EventObjectInteractionPickBerryTree + special ObjectEventInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_1A1642 - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message Route102_Text_1A17FD playfanfare MUS_ME_KINOMI waitmessage @@ -138,7 +138,7 @@ BerryTree_EventScript_1A164B:: @ 81A164B S_PlantBerryTreeFromBag:: @ 81A1654 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call S_PlantBerryTree releaseall end @@ -157,12 +157,12 @@ BerryTree_EventScript_1A168D:: @ 81A168D end S_WaterBerryTreeFromBag:: @ 81A168F - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall S_WaterBerryTree:: @ 81A1693 message Route102_Text_1A1912 waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 @@ -172,7 +172,7 @@ S_WaterBerryTree:: @ 81A1693 end S_PlantBerryTree:: @ 81A16A9 - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 29e05c513..f8d57f084 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 @@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 diff --git a/data/specials.inc b/data/specials.inc index a59cae339..86e62455c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -51,12 +51,12 @@ gSpecials:: def_special LoadPlayerParty def_special sub_80C5568 def_special sub_8083BDC - def_special EventObjectInteractionGetBerryTreeData + def_special ObjectEventInteractionGetBerryTreeData def_special Berry_FadeAndGoToBerryBagMenu - def_special EventObjectInteractionPlantBerryTree - def_special EventObjectInteractionPickBerryTree - def_special EventObjectInteractionRemoveBerryTree - def_special EventObjectInteractionWaterBerryTree + def_special ObjectEventInteractionPlantBerryTree + def_special ObjectEventInteractionPickBerryTree + def_special ObjectEventInteractionRemoveBerryTree + def_special ObjectEventInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special ScrSpecial_GetTrainerBattleMode @@ -187,7 +187,7 @@ gSpecials:: def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToEventObjectLocalIds + def_special GabbyAndTySetScriptVarsToObjectEventLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -337,7 +337,7 @@ gSpecials:: def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special TryInitBattleTowerAwardManEventObject + def_special TryInitBattleTowerAwardManObjectEvent def_special MoveSecretBase def_special LoadPlayerBag def_special sub_8081924 |