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

Merge branch 'master' into modern_gcc

Browse Source
This commit is contained in:
PikalaxALT 2020-02-13 15:13:30 -05:00
commit 3b2eaeedbc
747 changed files with 12096 additions and 12327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
data-de/event_scripts.s vendored
View File

@ -1847,11 +1847,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
@ -1865,11 +1865,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
@ -1896,30 +1896,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

40
data/event_scripts.s vendored
View File

@ -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

2
data/layouts/layouts.json
View File

@ -3322,4 +3322,4 @@
"blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin"
}
]
}
}

4
data/map_events.s
View File

@ -1,7 +1,7 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/bg_event_constants.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_bg.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/maps.h"
#include "constants/secret_bases.h"

6
data/maps/AbandonedShip_CaptainsOffice/map.json vendored
View File

@ -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": []
}
}

6
data/maps/AbandonedShip_Corridors_1F/map.json vendored
View File

@ -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": []
}
}

6
data/maps/AbandonedShip_Corridors_B1F/map.json vendored
View File

@ -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"
}
]
}
}

2
data/maps/AbandonedShip_Deck/map.json vendored
View File

@ -50,4 +50,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AbandonedShip_HiddenFloorCorridors/map.json vendored
View File

@ -90,4 +90,4 @@
"script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC98"
}
]
}
}

10
data/maps/AbandonedShip_HiddenFloorRooms/map.json vendored
View File

@ -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"
}
]
}
}

4
data/maps/AbandonedShip_Room_B1F/map.json vendored
View File

@ -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": []
}
}

8
data/maps/AbandonedShip_Rooms2_1F/map.json vendored
View File

@ -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": []
}
}

6
data/maps/AbandonedShip_Rooms2_B1F/map.json vendored
View File

@ -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": []
}
}

6
data/maps/AbandonedShip_Rooms_1F/map.json vendored
View File

@ -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": []
}
}

6
data/maps/AbandonedShip_Rooms_B1F/map.json vendored
View File

@ -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": []
}
}

2
data/maps/AbandonedShip_Underwater1/map.json vendored
View File

@ -29,4 +29,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AbandonedShip_Underwater2/map.json vendored
View File

@ -22,4 +22,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/AncientTomb/map.json vendored
View File

@ -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"
}
]
}
}

8
data/maps/AquaHideout_1F/map.json vendored
View File

@ -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": []
}
}

18
data/maps/AquaHideout_B1F/map.json vendored
View File

@ -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": []
}
}

12
data/maps/AquaHideout_B2F/map.json vendored
View File

@ -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": []
}
}

6
data/maps/BattleTower_BattleRoom/map.json vendored
View File

@ -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": []
}
}

4
data/maps/BattleTower_Corridor/map.json vendored
View File

@ -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": []
}
}

4
data/maps/BattleTower_Elevator/map.json vendored
View File

@ -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": []
}
}

14
data/maps/BattleTower_Lobby/map.json vendored
View File

@ -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"
}
]
}
}

4
data/maps/BattleTower_Lobby/scripts.inc vendored
View File

@ -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

12
data/maps/BattleTower_Outside/map.json vendored
View File

@ -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"
}
]
}
}

2
data/maps/CaveOfOrigin_1F/map.json vendored
View File

@ -57,4 +57,4 @@
}
],
"bg_events": []
}
}

2
data/maps/CaveOfOrigin_B1F/map.json vendored
View File

@ -57,4 +57,4 @@
}
],
"bg_events": []
}
}

2
data/maps/CaveOfOrigin_B2F/map.json vendored
View File

@ -57,4 +57,4 @@
}
],
"bg_events": []
}
}

4
data/maps/CaveOfOrigin_B3F/map.json vendored
View File

@ -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": []
}
}

4
data/maps/CaveOfOrigin_B4F/map.json vendored
View File

@ -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": []
}
}

2
data/maps/CaveOfOrigin_Entrance/map.json vendored
View File

@ -29,4 +29,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/DesertRuins/map.json vendored
View File

@ -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"
}
]
}
}

12
data/maps/DewfordTown/map.json vendored
View File

@ -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"
}
]
}
}

12
data/maps/DewfordTown_Gym/map.json vendored
View File

@ -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"
}
]
}
}

20
data/maps/DewfordTown_Hall/map.json vendored
View File

@ -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"
}
]
}
}

8
data/maps/DewfordTown_House1/map.json vendored
View File

@ -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": []
}
}

6
data/maps/DewfordTown_House2/map.json vendored
View File

@ -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": []
}
}

8
data/maps/DewfordTown_PokemonCenter_1F/map.json vendored
View File

@ -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": []
}
}

8
data/maps/DewfordTown_PokemonCenter_2F/map.json vendored
View File

@ -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": []
}
}

2
data/maps/DoubleBattleColosseum/map.json vendored
View File

@ -80,4 +80,4 @@
}
],
"bg_events": []
}
}

2
data/maps/EverGrandeCity/map.json vendored
View File

@ -190,4 +190,4 @@
"script": "EverGrandeCity_EventScript_1A00EA"
}
]
}
}

8
data/maps/EverGrandeCity_ChampionsRoom/map.json vendored
View File

@ -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": []
}
}

2
data/maps/EverGrandeCity_Corridor1/map.json vendored
View File

@ -43,4 +43,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/EverGrandeCity_Corridor2/map.json vendored
View File

@ -43,4 +43,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/EverGrandeCity_Corridor3/map.json vendored
View File

@ -43,4 +43,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/EverGrandeCity_Corridor4/map.json vendored
View File

@ -29,4 +29,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/EverGrandeCity_Corridor5/map.json vendored
View File

@ -43,4 +43,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/EverGrandeCity_DrakesRoom/map.json vendored
View File

@ -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": []
}
}

4
data/maps/EverGrandeCity_GlaciasRoom/map.json vendored
View File

@ -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": []
}
}

4
data/maps/EverGrandeCity_HallOfFame/map.json vendored
View File

@ -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": []
}
}

4
data/maps/EverGrandeCity_PhoebesRoom/map.json vendored
View File

@ -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": []
}
}

8
data/maps/EverGrandeCity_PokemonCenter_1F/map.json vendored
View File

@ -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": []
}
}

8
data/maps/EverGrandeCity_PokemonCenter_2F/map.json vendored
View File

@ -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": []
}
}

10
data/maps/EverGrandeCity_PokemonLeague/map.json vendored
View File

@ -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": []
}
}

4
data/maps/EverGrandeCity_SidneysRoom/map.json vendored
View File

@ -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": []
}
}

10
data/maps/FallarborTown/map.json vendored
View File

@ -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"
}
]
}
}

8
data/maps/FallarborTown_ContestHall/map.json vendored
View File

@ -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"
}
]
}
}

14
data/maps/FallarborTown_ContestLobby/map.json vendored
View File

@ -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"
}
]
}
}

6
data/maps/FallarborTown_House1/map.json vendored
View File

@ -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": []
}
}

4
data/maps/FallarborTown_House2/map.json vendored
View File

@ -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": []
}
}

10
data/maps/FallarborTown_Mart/map.json vendored
View File

@ -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": []
}
}

10
data/maps/FallarborTown_PokemonCenter_1F/map.json vendored
View File

@ -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": []
}
}

8
data/maps/FallarborTown_PokemonCenter_2F/map.json vendored
View File

@ -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": []
}
}

18
data/maps/FieryPath/map.json vendored
View File

@ -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": []
}
}

16
data/maps/FortreeCity/map.json vendored
View File

@ -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"
}
]
}
}

10
data/maps/FortreeCity_DecorationShop/map.json vendored
View File

@ -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": []
}
}

14
data/maps/FortreeCity_Gym/map.json vendored
View File

@ -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"
}
]
}
}

8
data/maps/FortreeCity_House1/map.json vendored
View File

@ -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": []
}
}

4
data/maps/FortreeCity_House2/map.json vendored
View File

@ -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": []
}
}

6
data/maps/FortreeCity_House3/map.json vendored
View File

@ -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": []
}
}

8
data/maps/FortreeCity_House4/map.json vendored
View File

@ -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": []
}
}

8
data/maps/FortreeCity_House5/map.json vendored
View File

@ -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": []
}
}

10
data/maps/FortreeCity_Mart/map.json vendored
View File

@ -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": []
}
}

10
data/maps/FortreeCity_PokemonCenter_1F/map.json vendored
View File

@ -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": []
}
}

8
data/maps/FortreeCity_PokemonCenter_2F/map.json vendored
View File

@ -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": []
}
}

6
data/maps/GraniteCave_1F/map.json vendored
View File

@ -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": []
}
}

4
data/maps/GraniteCave_B1F/map.json vendored
View File

@ -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": []
}
}

20
data/maps/GraniteCave_B2F/map.json vendored
View File

@ -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"
}
]
}
}

4
data/maps/GraniteCave_StevensRoom/map.json vendored
View File

@ -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": []
}
}

8
data/maps/InsideOfTruck/map.json vendored
View File

@ -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"
}
]
}
}

4
data/maps/IslandCave/map.json vendored
View File

@ -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"
}
]
}
}

10
data/maps/JaggedPass/map.json vendored
View File

@ -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"
}
]
}
}

20
data/maps/LavaridgeTown/map.json vendored
View File

@ -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"
}
]
}
}

16
data/maps/LavaridgeTown_Gym_1F/map.json vendored
View File

@ -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"
}
]
}
}

2
data/maps/LavaridgeTown_Gym_B1F/map.json vendored
View File

@ -155,4 +155,4 @@
],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/LavaridgeTown_HerbShop/map.json vendored
View File

@ -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": []
}
}

6
data/maps/LavaridgeTown_House/map.json vendored
View File

@ -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": []
}
}

8
data/maps/LavaridgeTown_Mart/map.json vendored
View File

@ -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": []
}
}

10
data/maps/LavaridgeTown_PokemonCenter_1F/map.json vendored
View File

@ -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": []
}
}

8
data/maps/LavaridgeTown_PokemonCenter_2F/map.json vendored
View File

@ -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": []
}
}

36
data/maps/LilycoveCity/map.json vendored
View File

@ -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"
}
]
}
}

66
data/maps/LilycoveCity_ContestHall/map.json vendored
View File

@ -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"
}
]
}
}

30
data/maps/LilycoveCity_ContestLobby/map.json vendored
View File

@ -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"
}
]
}
}

4
data/maps/LilycoveCity_CoveLilyMotel_1F/map.json vendored
View File

@ -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": []
}
}

14
data/maps/LilycoveCity_CoveLilyMotel_2F/map.json vendored
View File

@ -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": []
}
}

4
data/maps/LilycoveCity_DepartmentStoreElevator/map.json vendored
View File

@ -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": []
}
}

8
data/maps/LilycoveCity_DepartmentStoreRooftop/map.json vendored
View File

@ -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"
}
]
}
}

14
data/maps/LilycoveCity_DepartmentStore_1F/map.json vendored
View File

@ -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"
}
]
}
}

Some files were not shown because too many files have changed in this diff Show More