Merge pull request #300 from lhearachel/build-refactor/events

Refactor generation of event data files and packing of zone_event.narc
pret · Nov 15, 2024 · af89ed7 · af89ed7
2 parents 97500e0 + fbdf83b
commit af89ed7
Show file tree

Hide file tree

Showing 543 changed files with 1,347 additions and 749 deletions.
diff --git a/include/data/map_headers.h b/include/data/map_headers.h
diff --git a/res/field/encounters/meson.build b/res/field/encounters/meson.build
@@ -1,5 +1,5 @@
 enc_bin_gen = generator(
-    encounters_new_py,
+    encounter_py,
     arguments: [ '@INPUT@', '@OUTPUT@', ],
     output: '@[email protected]'
 )

diff --git a/res/field/events/events_0307.json → res/field/events/events_acuity_cavern.json b/res/field/events/events_0307.json → res/field/events/events_acuity_cavern.json
diff --git a/res/field/events/events_0326.json → ...field/events/events_acuity_lakefront.json b/res/field/events/events_0326.json → ...field/events/events_acuity_lakefront.json
diff --git a/res/field/events/events_0246.json → res/field/events/events_amity_square.json b/res/field/events/events_0246.json → res/field/events/events_amity_square.json
diff --git a/res/field/events/events_0518.json → res/field/events/events_battle_arcade.json b/res/field/events/events_0518.json → res/field/events/events_battle_arcade.json
diff --git a/res/field/events/events_0517.json → res/field/events/events_battle_castle.json b/res/field/events/events_0517.json → res/field/events/events_battle_castle.json
diff --git a/res/field/events/events_0515.json → res/field/events/events_battle_factory.json b/res/field/events/events_0515.json → res/field/events/events_battle_factory.json
diff --git a/res/field/events/events_0513.json → res/field/events/events_battle_frontier.json b/res/field/events/events_0513.json → res/field/events/events_battle_frontier.json
diff --git a/res/field/events/events_0514.json → ...s_battle_frontier_gate_to_fight_area.json b/res/field/events/events_0514.json → ...s_battle_frontier_gate_to_fight_area.json
diff --git a/res/field/events/events_0516.json → res/field/events/events_battle_hall.json b/res/field/events/events_0516.json → res/field/events/events_battle_hall.json
diff --git a/res/field/events/events_0310.json → res/field/events/events_battle_park.json b/res/field/events/events_0310.json → res/field/events/events_battle_park.json
diff --git a/res/field/events/events_0311.json → ..._battle_park_exchange_service_corner.json b/res/field/events/events_0311.json → ..._battle_park_exchange_service_corner.json
diff --git a/res/field/events/events_0191.json → ...vents_battle_park_gate_to_fight_area.json b/res/field/events/events_0191.json → ...vents_battle_park_gate_to_fight_area.json
diff --git a/res/field/events/events_0312.json → res/field/events/events_battle_tower.json b/res/field/events/events_0312.json → res/field/events/events_battle_tower.json
diff --git a/res/field/events/events_0316.json → ...ents/events_battle_tower_battle_room.json b/res/field/events/events_0316.json → ...ents/events_battle_tower_battle_room.json
diff --git a/res/field/events/events_0470.json → ...nts/events_battle_tower_battle_salon.json b/res/field/events/events_0470.json → ...nts/events_battle_tower_battle_salon.json
diff --git a/res/field/events/events_0314.json → .../events/events_battle_tower_corridor.json b/res/field/events/events_0314.json → .../events/events_battle_tower_corridor.json
diff --git a/res/field/events/events_0315.json → ...s/events_battle_tower_corridor_multi.json b/res/field/events/events_0315.json → ...s/events_battle_tower_corridor_multi.json
diff --git a/res/field/events/events_0313.json → .../events/events_battle_tower_elevator.json b/res/field/events/events_0313.json → .../events/events_battle_tower_elevator.json
diff --git a/res/field/events/events_0317.json → ...vents_battle_tower_multi_battle_room.json b/res/field/events/events_0317.json → ...vents_battle_tower_multi_battle_room.json
diff --git a/res/field/events/events_0433.json → res/field/events/events_battleground.json b/res/field/events/events_0433.json → res/field/events/events_battleground.json
diff --git a/res/field/events/events_0469.json → res/field/events/events_cafe.json b/res/field/events/events_0469.json → res/field/events/events_cafe.json
diff --git a/res/field/events/events_0032.json → res/field/events/events_canalave_city.json b/res/field/events/events_0032.json → res/field/events/events_canalave_city.json
diff --git a/res/field/events/events_0041.json → ...ents/events_canalave_city_east_house.json b/res/field/events/events_0041.json → ...ents/events_canalave_city_east_house.json
diff --git a/res/field/events/events_0034.json → ...ield/events/events_canalave_city_gym.json b/res/field/events/events_0034.json → ...ield/events/events_canalave_city_gym.json
diff --git a/res/field/events/events_0042.json → ...ents/events_canalave_city_harbor_inn.json b/res/field/events/events_0042.json → ...ents/events_canalave_city_harbor_inn.json
diff --git a/res/field/events/events_0033.json → ...eld/events/events_canalave_city_mart.json b/res/field/events/events_0033.json → ...eld/events/events_canalave_city_mart.json
diff --git a/res/field/events/events_0035.json → ...s/events_canalave_city_pokecenter_1f.json b/res/field/events/events_0035.json → ...s/events_canalave_city_pokecenter_1f.json
diff --git a/res/field/events/events_0036.json → ...s/events_canalave_city_pokecenter_2f.json b/res/field/events/events_0036.json → ...s/events_canalave_city_pokecenter_2f.json
diff --git a/res/field/events/events_0452.json → .../events_canalave_city_pokecenter_b1f.json b/res/field/events/events_0452.json → .../events_canalave_city_pokecenter_b1f.json
diff --git a/res/field/events/events_0043.json → ..._canalave_city_sailor_eldritch_house.json b/res/field/events/events_0043.json → ..._canalave_city_sailor_eldritch_house.json
diff --git a/res/field/events/events_0040.json → ...events_canalave_city_southeast_house.json b/res/field/events/events_0040.json → ...events_canalave_city_southeast_house.json
diff --git a/res/field/events/events_0468.json → ...ents/events_canalave_city_west_house.json b/res/field/events/events_0468.json → ...ents/events_canalave_city_west_house.json
diff --git a/res/field/events/events_0037.json → ...ld/events/events_canalave_library_1f.json b/res/field/events/events_0037.json → ...ld/events/events_canalave_library_1f.json
diff --git a/res/field/events/events_0038.json → ...ld/events/events_canalave_library_2f.json b/res/field/events/events_0038.json → ...ld/events/events_canalave_library_2f.json
diff --git a/res/field/events/events_0039.json → ...ld/events/events_canalave_library_3f.json b/res/field/events/events_0039.json → ...ld/events/events_canalave_library_3f.json
diff --git a/res/field/events/events_0421.json → res/field/events/events_celestic_town.json b/res/field/events/events_0421.json → res/field/events/events_celestic_town.json
diff --git a/res/field/events/events_0428.json → ...eld/events/events_celestic_town_cave.json b/res/field/events/events_0428.json → ...eld/events/events_celestic_town_cave.json
diff --git a/res/field/events/events_0424.json → ...nts/events_celestic_town_north_house.json b/res/field/events/events_0424.json → ...nts/events_celestic_town_north_house.json
diff --git a/res/field/events/events_0426.json → ...events_celestic_town_northeast_house.json b/res/field/events/events_0426.json → ...events_celestic_town_northeast_house.json
diff --git a/res/field/events/events_0425.json → ...events_celestic_town_northwest_house.json b/res/field/events/events_0425.json → ...events_celestic_town_northwest_house.json
diff --git a/res/field/events/events_0422.json → ...s/events_celestic_town_pokecenter_1f.json b/res/field/events/events_0422.json → ...s/events_celestic_town_pokecenter_1f.json
diff --git a/res/field/events/events_0423.json → ...s/events_celestic_town_pokecenter_2f.json b/res/field/events/events_0423.json → ...s/events_celestic_town_pokecenter_2f.json
diff --git a/res/field/events/events_0465.json → .../events_celestic_town_pokecenter_b1f.json b/res/field/events/events_0465.json → .../events_celestic_town_pokecenter_b1f.json
diff --git a/res/field/events/events_0427.json → ...events_celestic_town_southwest_house.json b/res/field/events/events_0427.json → ...events_celestic_town_southwest_house.json
diff --git a/res/field/events/events_0318.json → ...ents_communication_club_colosseum_2p.json b/res/field/events/events_0318.json → ...ents_communication_club_colosseum_2p.json
diff --git a/res/field/events/events_0319.json → ...ents_communication_club_colosseum_4p.json b/res/field/events/events_0319.json → ...ents_communication_club_colosseum_4p.json
diff --git a/res/field/events/events_0116.json → ...eld/events/events_contest_hall_lobby.json b/res/field/events/events_0116.json → ...eld/events/events_contest_hall_lobby.json
diff --git a/res/field/events/events_0512.json → ...events_contest_hall_stage_no_contest.json b/res/field/events/events_0512.json → ...events_contest_hall_stage_no_contest.json
diff --git a/res/field/events/events_0117.json → ...s_contest_hall_stage_ongoing_contest.json b/res/field/events/events_0117.json → ...s_contest_hall_stage_ongoing_contest.json
diff --git a/res/field/events/events_0070.json → res/field/events/events_cycle_shop.json b/res/field/events/events_0070.json → res/field/events/events_cycle_shop.json
diff --git a/res/field/events/events_0524.json → ...ld/events/events_distortion_world_1f.json b/res/field/events/events_0524.json → ...ld/events/events_distortion_world_1f.json
diff --git a/res/field/events/events_0000.json → res/field/events/events_empty.json b/res/field/events/events_0000.json → res/field/events/events_empty.json
diff --git a/res/field/events/events_0064.json → res/field/events/events_eterna_city.json b/res/field/events/events_0064.json → res/field/events/events_eterna_city.json
diff --git a/res/field/events/events_0075.json → ...s/events_eterna_city_condominiums_1f.json b/res/field/events/events_0075.json → ...s/events_eterna_city_condominiums_1f.json
diff --git a/res/field/events/events_0076.json → ...s/events_eterna_city_condominiums_2f.json b/res/field/events/events_0076.json → ...s/events_eterna_city_condominiums_2f.json
diff --git a/res/field/events/events_0077.json → ...s/events_eterna_city_condominiums_3f.json b/res/field/events/events_0077.json → ...s/events_eterna_city_condominiums_3f.json
diff --git a/res/field/events/events_0078.json → ...s/events_eterna_city_condominiums_4f.json b/res/field/events/events_0078.json → ...s/events_eterna_city_condominiums_4f.json
diff --git a/res/field/events/events_0067.json → ...eld/events/events_eterna_city_dp_gym.json b/res/field/events/events_0067.json → ...eld/events/events_eterna_city_dp_gym.json
diff --git a/res/field/events/events_0082.json → ...events/events_eterna_city_east_house.json b/res/field/events/events_0082.json → ...events/events_eterna_city_east_house.json
diff --git a/res/field/events/events_0066.json → res/field/events/events_eterna_city_gym.json b/res/field/events/events_0066.json → res/field/events/events_eterna_city_gym.json
diff --git a/res/field/events/events_0065.json → ...field/events/events_eterna_city_mart.json b/res/field/events/events_0065.json → ...field/events/events_eterna_city_mart.json
diff --git a/res/field/events/events_0080.json → ...vents/events_eterna_city_north_house.json b/res/field/events/events_0080.json → ...vents/events_eterna_city_north_house.json
diff --git a/res/field/events/events_0068.json → ...nts/events_eterna_city_pokecenter_1f.json b/res/field/events/events_0068.json → ...nts/events_eterna_city_pokecenter_1f.json
diff --git a/res/field/events/events_0069.json → ...nts/events_eterna_city_pokecenter_2f.json b/res/field/events/events_0069.json → ...nts/events_eterna_city_pokecenter_2f.json
diff --git a/res/field/events/events_0454.json → ...ts/events_eterna_city_pokecenter_b1f.json b/res/field/events/events_0454.json → ...ts/events_eterna_city_pokecenter_b1f.json
diff --git a/res/field/events/events_0081.json → ...vents/events_eterna_city_south_house.json b/res/field/events/events_0081.json → ...vents/events_eterna_city_south_house.json
diff --git a/res/field/events/events_0083.json → ...ts_eterna_city_underground_man_house.json b/res/field/events/events_0083.json → ...ts_eterna_city_underground_man_house.json
diff --git a/res/field/events/events_0084.json → ...nts/events_eterna_city_unknown_house.json b/res/field/events/events_0084.json → ...nts/events_eterna_city_unknown_house.json
diff --git a/res/field/events/events_0201.json → res/field/events/events_eterna_forest.json b/res/field/events/events_0201.json → res/field/events/events_eterna_forest.json
diff --git a/res/field/events/events_0200.json → .../events/events_eterna_forest_outside.json b/res/field/events/events_0200.json → .../events/events_eterna_forest_outside.json
diff --git a/res/field/events/events_0187.json → res/field/events/events_fight_area.json b/res/field/events/events_0187.json → res/field/events/events_fight_area.json
diff --git a/res/field/events/events_0190.json → res/field/events/events_fight_area_mart.json b/res/field/events/events_0190.json → res/field/events/events_fight_area_mart.json
diff --git a/res/field/events/events_0193.json → ...vents/events_fight_area_middle_house.json b/res/field/events/events_0193.json → ...vents/events_fight_area_middle_house.json
diff --git a/res/field/events/events_0188.json → ...ents/events_fight_area_pokecenter_1f.json b/res/field/events/events_0188.json → ...ents/events_fight_area_pokecenter_1f.json
diff --git a/res/field/events/events_0189.json → ...ents/events_fight_area_pokecenter_2f.json b/res/field/events/events_0189.json → ...ents/events_fight_area_pokecenter_2f.json
diff --git a/res/field/events/events_0461.json → ...nts/events_fight_area_pokecenter_b1f.json b/res/field/events/events_0461.json → ...nts/events_fight_area_pokecenter_b1f.json
diff --git a/res/field/events/events_0194.json → ...events/events_fight_area_south_house.json b/res/field/events/events_0194.json → ...events/events_fight_area_south_house.json
diff --git a/res/field/events/events_0249.json → res/field/events/events_floaroma_meadow.json b/res/field/events/events_0249.json → res/field/events/events_floaroma_meadow.json
diff --git a/res/field/events/events_0250.json → .../events/events_floaroma_meadow_house.json b/res/field/events/events_0250.json → .../events/events_floaroma_meadow_house.json
diff --git a/res/field/events/events_0405.json → res/field/events/events_floaroma_town.json b/res/field/events/events_0405.json → res/field/events/events_floaroma_town.json
diff --git a/res/field/events/events_0406.json → ...eld/events/events_floaroma_town_mart.json b/res/field/events/events_0406.json → ...eld/events/events_floaroma_town_mart.json
diff --git a/res/field/events/events_0411.json → ...ts/events_floaroma_town_middle_house.json b/res/field/events/events_0411.json → ...ts/events_floaroma_town_middle_house.json
diff --git a/res/field/events/events_0407.json → ...s/events_floaroma_town_pokecenter_1f.json b/res/field/events/events_0407.json → ...s/events_floaroma_town_pokecenter_1f.json
diff --git a/res/field/events/events_0408.json → ...s/events_floaroma_town_pokecenter_2f.json b/res/field/events/events_0408.json → ...s/events_floaroma_town_pokecenter_2f.json
diff --git a/res/field/events/events_0463.json → .../events_floaroma_town_pokecenter_b1f.json b/res/field/events/events_0463.json → .../events_floaroma_town_pokecenter_b1f.json
diff --git a/res/field/events/events_0410.json → ...events_floaroma_town_southeast_house.json b/res/field/events/events_0410.json → ...events_floaroma_town_southeast_house.json
diff --git a/res/field/events/events_0266.json → res/field/events/events_flower_paradise.json b/res/field/events/events_0266.json → res/field/events/events_flower_paradise.json
diff --git a/res/field/events/events_0409.json → res/field/events/events_flower_shop.json b/res/field/events/events_0409.json → res/field/events/events_flower_shop.json
diff --git a/res/field/events/events_0361.json → res/field/events/events_footstep_house.json b/res/field/events/events_0361.json → res/field/events/events_footstep_house.json
diff --git a/res/field/events/events_0118.json → ...field/events/events_foreign_building.json b/res/field/events/events_0118.json → ...field/events/events_foreign_building.json
diff --git a/res/field/events/events_0203.json → ...ents/events_fuego_ironworks_building.json b/res/field/events/events_0203.json → ...ents/events_fuego_ironworks_building.json
diff --git a/res/field/events/events_0202.json → ...vents/events_fuego_ironworks_outside.json b/res/field/events/events_0202.json → ...vents/events_fuego_ironworks_outside.json
diff --git a/res/field/events/events_0253.json → res/field/events/events_fullmoon_island.json b/res/field/events/events_0253.json → res/field/events/events_fullmoon_island.json
diff --git a/res/field/events/events_0254.json → ...events/events_fullmoon_island_forest.json b/res/field/events/events_0254.json → ...events/events_fullmoon_island_forest.json
diff --git a/res/field/events/events_0293.json → res/field/events/events_galactic_hq_1f.json b/res/field/events/events_0293.json → res/field/events/events_galactic_hq_1f.json
diff --git a/res/field/events/events_0294.json → res/field/events/events_galactic_hq_2f.json b/res/field/events/events_0294.json → res/field/events/events_galactic_hq_2f.json
diff --git a/res/field/events/events_0295.json → res/field/events/events_galactic_hq_3f.json b/res/field/events/events_0295.json → res/field/events/events_galactic_hq_3f.json
diff --git a/res/field/events/events_0296.json → res/field/events/events_galactic_hq_4f.json b/res/field/events/events_0296.json → res/field/events/events_galactic_hq_4f.json
diff --git a/res/field/events/events_0297.json → res/field/events/events_galactic_hq_b1f.json b/res/field/events/events_0297.json → res/field/events/events_galactic_hq_b1f.json
diff --git a/res/field/events/events_0298.json → res/field/events/events_galactic_hq_b2f.json b/res/field/events/events_0298.json → res/field/events/events_galactic_hq_b2f.json
diff --git a/res/field/events/events_0471.json → ...ents/events_galactic_hq_control_room.json b/res/field/events/events_0471.json → ...ents/events_galactic_hq_control_room.json
diff --git a/res/field/events/events_0522.json → ...field/events/events_galactic_hq_hall.json b/res/field/events/events_0522.json → ...field/events/events_galactic_hq_hall.json
diff --git a/res/field/events/events_0474.json → ...events/events_galactic_hq_laboratory.json b/res/field/events/events_0474.json → ...events/events_galactic_hq_laboratory.json
diff --git a/res/field/events/events_0135.json → res/field/events/events_game_corner.json b/res/field/events/events_0135.json → res/field/events/events_game_corner.json
diff --git a/res/field/events/events_0338.json → ...s_gate_between_eterna_city_route_206.json b/res/field/events/events_0338.json → ...s_gate_between_eterna_city_route_206.json
diff --git a/res/field/events/events_0027.json → ...eld/events/events_global_terminal_1f.json b/res/field/events/events_0027.json → ...eld/events/events_global_terminal_1f.json
diff --git a/res/field/events/events_0520.json → ...eld/events/events_global_terminal_2f.json b/res/field/events/events_0520.json → ...eld/events/events_global_terminal_2f.json
diff --git a/res/field/events/events_0521.json → ...eld/events/events_global_terminal_3f.json b/res/field/events/events_0521.json → ...eld/events/events_global_terminal_3f.json
diff --git a/res/field/events/events_0363.json → ...ents_grand_lake_route_213_east_house.json b/res/field/events/events_0363.json → ...ents_grand_lake_route_213_east_house.json
diff --git a/res/field/events/events_0362.json → ...ts/events_grand_lake_route_213_lobby.json b/res/field/events/events_0362.json → ...ts/events_grand_lake_route_213_lobby.json
diff --git a/res/field/events/events_0365.json → ...grand_lake_route_213_northeast_house.json b/res/field/events/events_0365.json → ...grand_lake_route_213_northeast_house.json
diff --git a/res/field/events/events_0364.json → ...grand_lake_route_213_northwest_house.json b/res/field/events/events_0364.json → ...grand_lake_route_213_northwest_house.json
diff --git a/res/field/events/events_0324.json → ...rand_lake_valor_lakefront_east_house.json b/res/field/events/events_0324.json → ...rand_lake_valor_lakefront_east_house.json
diff --git a/res/field/events/events_0325.json → ...rand_lake_valor_lakefront_west_house.json b/res/field/events/events_0325.json → ...rand_lake_valor_lakefront_west_house.json
diff --git a/res/field/events/events_0481.json → res/field/events/events_great_marsh_1.json b/res/field/events/events_0481.json → res/field/events/events_great_marsh_1.json
diff --git a/res/field/events/events_0482.json → res/field/events/events_great_marsh_2.json b/res/field/events/events_0482.json → res/field/events/events_great_marsh_2.json
diff --git a/res/field/events/events_0483.json → res/field/events/events_great_marsh_3.json b/res/field/events/events_0483.json → res/field/events/events_great_marsh_3.json
diff --git a/res/field/events/events_0484.json → res/field/events/events_great_marsh_4.json b/res/field/events/events_0484.json → res/field/events/events_great_marsh_4.json
diff --git a/res/field/events/events_0485.json → res/field/events/events_great_marsh_5.json b/res/field/events/events_0485.json → res/field/events/events_great_marsh_5.json
diff --git a/res/field/events/events_0486.json → res/field/events/events_great_marsh_6.json b/res/field/events/events_0486.json → res/field/events/events_great_marsh_6.json
diff --git a/res/field/events/events_0487.json → res/field/events/events_hall_of_origin.json b/res/field/events/events_0487.json → res/field/events/events_hall_of_origin.json
diff --git a/res/field/events/events_0085.json → res/field/events/events_hearthome_city.json b/res/field/events/events_0085.json → res/field/events/events_hearthome_city.json
diff --git a/res/field/events/events_0092.json → ...earthome_city_dp_gym_elevator_room_1.json b/res/field/events/events_0092.json → ...earthome_city_dp_gym_elevator_room_1.json
diff --git a/res/field/events/events_0094.json → ...earthome_city_dp_gym_elevator_room_2.json b/res/field/events/events_0094.json → ...earthome_city_dp_gym_elevator_room_2.json
diff --git a/res/field/events/events_0099.json → ...ts_hearthome_city_dp_gym_leader_room.json b/res/field/events/events_0099.json → ...ts_hearthome_city_dp_gym_leader_room.json
diff --git a/res/field/events/events_0091.json → ...hearthome_city_dp_gym_trainer_room_1.json b/res/field/events/events_0091.json → ...hearthome_city_dp_gym_trainer_room_1.json
diff --git a/res/field/events/events_0093.json → ...hearthome_city_dp_gym_trainer_room_2.json b/res/field/events/events_0093.json → ...hearthome_city_dp_gym_trainer_room_2.json
diff --git a/res/field/events/events_0095.json → ...hearthome_city_dp_gym_trainer_room_3.json b/res/field/events/events_0095.json → ...hearthome_city_dp_gym_trainer_room_3.json
diff --git a/res/field/events/events_0096.json → ...hearthome_city_dp_gym_trainer_room_4.json b/res/field/events/events_0096.json → ...hearthome_city_dp_gym_trainer_room_4.json
diff --git a/res/field/events/events_0097.json → ...hearthome_city_dp_gym_trainer_room_5.json b/res/field/events/events_0097.json → ...hearthome_city_dp_gym_trainer_room_5.json
diff --git a/res/field/events/events_0098.json → ...hearthome_city_dp_gym_trainer_room_6.json b/res/field/events/events_0098.json → ...hearthome_city_dp_gym_trainer_room_6.json
diff --git a/res/field/events/events_0107.json → ...thome_city_east_gate_to_amity_square.json b/res/field/events/events_0107.json → ...thome_city_east_gate_to_amity_square.json
diff --git a/res/field/events/events_0087.json → ...nts_hearthome_city_gym_entrance_room.json b/res/field/events/events_0087.json → ...nts_hearthome_city_gym_entrance_room.json
diff --git a/res/field/events/events_0090.json → ...vents_hearthome_city_gym_leader_room.json b/res/field/events/events_0090.json → ...vents_hearthome_city_gym_leader_room.json
diff --git a/res/field/events/events_0088.json → ...ts_hearthome_city_gym_trainer_room_1.json b/res/field/events/events_0088.json → ...ts_hearthome_city_gym_trainer_room_1.json
diff --git a/res/field/events/events_0089.json → ...ts_hearthome_city_gym_trainer_room_2.json b/res/field/events/events_0089.json → ...ts_hearthome_city_gym_trainer_room_2.json
diff --git a/res/field/events/events_0086.json → ...ld/events/events_hearthome_city_mart.json b/res/field/events/events_0086.json → ...ld/events/events_hearthome_city_mart.json
diff --git a/res/field/events/events_0111.json → ...ts_hearthome_city_northeast_house_1f.json b/res/field/events/events_0111.json → ...ts_hearthome_city_northeast_house_1f.json
diff --git a/res/field/events/events_0112.json → ...ts_hearthome_city_northeast_house_2f.json b/res/field/events/events_0112.json → ...ts_hearthome_city_northeast_house_2f.json
diff --git a/res/field/events/events_0104.json → ...rthome_city_northeast_house_elevator.json b/res/field/events/events_0104.json → ...rthome_city_northeast_house_elevator.json
diff --git a/res/field/events/events_0114.json → ...vents_hearthome_city_northwest_house.json b/res/field/events/events_0114.json → ...vents_hearthome_city_northwest_house.json
diff --git a/res/field/events/events_0100.json → .../events_hearthome_city_pokecenter_1f.json b/res/field/events/events_0100.json → .../events_hearthome_city_pokecenter_1f.json
diff --git a/res/field/events/events_0101.json → .../events_hearthome_city_pokecenter_2f.json b/res/field/events/events_0101.json → .../events_hearthome_city_pokecenter_2f.json
diff --git a/res/field/events/events_0455.json → ...events_hearthome_city_pokecenter_b1f.json b/res/field/events/events_0455.json → ...events_hearthome_city_pokecenter_b1f.json
diff --git a/res/field/events/events_0105.json → ...ents_hearthome_city_pokemon_fan_club.json b/res/field/events/events_0105.json → ...ents_hearthome_city_pokemon_fan_club.json
diff --git a/res/field/events/events_0102.json → ...ts_hearthome_city_southeast_house_1f.json b/res/field/events/events_0102.json → ...ts_hearthome_city_southeast_house_1f.json
diff --git a/res/field/events/events_0103.json → ...ts_hearthome_city_southeast_house_2f.json b/res/field/events/events_0103.json → ...ts_hearthome_city_southeast_house_2f.json
diff --git a/res/field/events/events_0113.json → ...rthome_city_southeast_house_elevator.json b/res/field/events/events_0113.json → ...rthome_city_southeast_house_elevator.json
diff --git a/res/field/events/events_0106.json → ...thome_city_west_gate_to_amity_square.json b/res/field/events/events_0106.json → ...thome_city_west_gate_to_amity_square.json
diff --git a/res/field/events/events_0531.json → res/field/events/events_iceberg_ruins.json b/res/field/events/events_0531.json → res/field/events/events_iceberg_ruins.json
diff --git a/res/field/events/events_0277.json → res/field/events/events_iron_island.json b/res/field/events/events_0277.json → res/field/events/events_iron_island.json
diff --git a/res/field/events/events_0278.json → res/field/events/events_iron_island_1f.json b/res/field/events/events_0278.json → res/field/events/events_iron_island_1f.json
diff --git a/res/field/events/events_0279.json → ...nts/events_iron_island_b1f_left_room.json b/res/field/events/events_0279.json → ...nts/events_iron_island_b1f_left_room.json
diff --git a/res/field/events/events_0280.json → ...ts/events_iron_island_b1f_right_room.json b/res/field/events/events_0280.json → ...ts/events_iron_island_b1f_right_room.json
diff --git a/res/field/events/events_0282.json → ...nts/events_iron_island_b2f_left_room.json b/res/field/events/events_0282.json → ...nts/events_iron_island_b2f_left_room.json
diff --git a/res/field/events/events_0281.json → ...ts/events_iron_island_b2f_right_room.json b/res/field/events/events_0281.json → ...ts/events_iron_island_b2f_right_room.json
diff --git a/res/field/events/events_0283.json → res/field/events/events_iron_island_b3f.json b/res/field/events/events_0283.json → res/field/events/events_iron_island_b3f.json
diff --git a/res/field/events/events_0490.json → ...ield/events/events_iron_island_house.json b/res/field/events/events_0490.json → ...ield/events/events_iron_island_house.json
diff --git a/res/field/events/events_0528.json → ...events/events_iron_island_iron_ruins.json b/res/field/events/events_0528.json → ...events/events_iron_island_iron_ruins.json
diff --git a/res/field/events/events_0529.json → res/field/events/events_iron_ruins.json b/res/field/events/events_0529.json → res/field/events/events_iron_ruins.json
diff --git a/res/field/events/events_0002.json → res/field/events/events_jubilife_city.json b/res/field/events/events_0002.json → res/field/events/events_jubilife_city.json
diff --git a/res/field/events/events_0023.json → ...events_jubilife_city_condominiums_1f.json b/res/field/events/events_0023.json → ...events_jubilife_city_condominiums_1f.json
diff --git a/res/field/events/events_0024.json → ...events_jubilife_city_condominiums_2f.json b/res/field/events/events_0024.json → ...events_jubilife_city_condominiums_2f.json
diff --git a/res/field/events/events_0025.json → ...events_jubilife_city_condominiums_3f.json b/res/field/events/events_0025.json → ...events_jubilife_city_condominiums_3f.json
diff --git a/res/field/events/events_0026.json → ...events_jubilife_city_condominiums_4f.json b/res/field/events/events_0026.json → ...events_jubilife_city_condominiums_4f.json
diff --git a/res/field/events/events_0003.json → ...eld/events/events_jubilife_city_mart.json b/res/field/events/events_0003.json → ...eld/events/events_jubilife_city_mart.json
diff --git a/res/field/events/events_0005.json → ...s/events_jubilife_city_pokecenter_1f.json b/res/field/events/events_0005.json → ...s/events_jubilife_city_pokecenter_1f.json
diff --git a/res/field/events/events_0006.json → ...s/events_jubilife_city_pokecenter_2f.json b/res/field/events/events_0006.json → ...s/events_jubilife_city_pokecenter_2f.json
diff --git a/res/field/events/events_0451.json → .../events_jubilife_city_pokecenter_b1f.json b/res/field/events/events_0451.json → .../events_jubilife_city_pokecenter_b1f.json
diff --git a/res/field/events/events_0018.json → .../events_jubilife_city_south_house_1f.json b/res/field/events/events_0018.json → .../events_jubilife_city_south_house_1f.json
diff --git a/res/field/events/events_0019.json → .../events_jubilife_city_south_house_2f.json b/res/field/events/events_0019.json → .../events_jubilife_city_south_house_2f.json
diff --git a/res/field/events/events_0020.json → .../events_jubilife_city_south_house_3f.json b/res/field/events/events_0020.json → .../events_jubilife_city_south_house_3f.json
diff --git a/res/field/events/events_0021.json → .../events_jubilife_city_south_house_4f.json b/res/field/events/events_0021.json → .../events_jubilife_city_south_house_4f.json
diff --git a/res/field/events/events_0029.json → ...nts_jubilife_city_southwest_house_1f.json b/res/field/events/events_0029.json → ...nts_jubilife_city_southwest_house_1f.json
diff --git a/res/field/events/events_0493.json → ...nts_jubilife_city_southwest_house_2f.json b/res/field/events/events_0493.json → ...nts_jubilife_city_southwest_house_2f.json
diff --git a/res/field/events/events_0004.json → ...events_jubilife_city_unknown_house_1.json b/res/field/events/events_0004.json → ...events_jubilife_city_unknown_house_1.json
diff --git a/res/field/events/events_0022.json → ...events_jubilife_city_unknown_house_2.json b/res/field/events/events_0022.json → ...events_jubilife_city_unknown_house_2.json
diff --git a/res/field/events/events_0030.json → ...events_jubilife_city_unknown_house_3.json b/res/field/events/events_0030.json → ...events_jubilife_city_unknown_house_3.json
diff --git a/res/field/events/events_0031.json → ...events_jubilife_city_unknown_house_4.json b/res/field/events/events_0031.json → ...events_jubilife_city_unknown_house_4.json
diff --git a/res/field/events/events_0010.json → res/field/events/events_jubilife_tv_1f.json b/res/field/events/events_0010.json → res/field/events/events_jubilife_tv_1f.json
diff --git a/res/field/events/events_0011.json → res/field/events/events_jubilife_tv_2f.json b/res/field/events/events_0011.json → res/field/events/events_jubilife_tv_2f.json
diff --git a/res/field/events/events_0014.json → ...events/events_jubilife_tv_2f_gallery.json b/res/field/events/events_0014.json → ...events/events_jubilife_tv_2f_gallery.json
diff --git a/res/field/events/events_0012.json → res/field/events/events_jubilife_tv_3f.json b/res/field/events/events_0012.json → res/field/events/events_jubilife_tv_3f.json
diff --git a/res/field/events/events_0015.json → ...s_jubilife_tv_3f_global_ranking_room.json b/res/field/events/events_0015.json → ...s_jubilife_tv_3f_global_ranking_room.json
diff --git a/res/field/events/events_0016.json → ...ts_jubilife_tv_3f_group_ranking_room.json b/res/field/events/events_0016.json → ...ts_jubilife_tv_3f_group_ranking_room.json
diff --git a/res/field/events/events_0013.json → res/field/events/events_jubilife_tv_4f.json b/res/field/events/events_0013.json → res/field/events/events_jubilife_tv_4f.json
diff --git a/res/field/events/events_0017.json → ...d/events/events_jubilife_tv_elevator.json b/res/field/events/events_0017.json → ...d/events/events_jubilife_tv_elevator.json
diff --git a/res/field/events/events_0306.json → res/field/events/events_lake_acuity.json b/res/field/events/events_0306.json → res/field/events/events_lake_acuity.json
diff --git a/res/field/events/events_0305.json → .../events/events_lake_acuity_low_water.json b/res/field/events/events_0305.json → .../events/events_lake_acuity_low_water.json
diff --git a/res/field/events/events_0303.json → res/field/events/events_lake_valor.json b/res/field/events/events_0303.json → res/field/events/events_lake_valor.json
diff --git a/res/field/events/events_0302.json → ...eld/events/events_lake_valor_drained.json b/res/field/events/events_0302.json → ...eld/events/events_lake_valor_drained.json
diff --git a/res/field/events/events_0300.json → res/field/events/events_lake_verity.json b/res/field/events/events_0300.json → res/field/events/events_lake_verity.json
diff --git a/res/field/events/events_0299.json → .../events/events_lake_verity_low_water.json b/res/field/events/events_0299.json → .../events/events_lake_verity_low_water.json
diff --git a/res/field/events/events_0489.json → res/field/events/events_maniac_tunnel.json b/res/field/events/events_0489.json → res/field/events/events_maniac_tunnel.json
diff --git a/res/field/events/events_0058.json → res/field/events/events_mining_museum.json b/res/field/events/events_0058.json → res/field/events/events_mining_museum.json
diff --git a/res/field/events/events_0215.json → ...ts/events_mt_coronet_1f_north_room_1.json b/res/field/events/events_0215.json → ...ts/events_mt_coronet_1f_north_room_1.json
diff --git a/res/field/events/events_0214.json → ...ts/events_mt_coronet_1f_north_room_2.json b/res/field/events/events_0214.json → ...ts/events_mt_coronet_1f_north_room_2.json
diff --git a/res/field/events/events_0204.json → ...ld/events/events_mt_coronet_1f_south.json b/res/field/events/events_0204.json → ...ld/events/events_mt_coronet_1f_south.json
diff --git a/res/field/events/events_0213.json → ...nts/events_mt_coronet_1f_tunnel_room.json b/res/field/events/events_0213.json → ...nts/events_mt_coronet_1f_tunnel_room.json
diff --git a/res/field/events/events_0205.json → res/field/events/events_mt_coronet_2f.json b/res/field/events/events_0205.json → res/field/events/events_mt_coronet_2f.json
diff --git a/res/field/events/events_0206.json → res/field/events/events_mt_coronet_3f.json b/res/field/events/events_0206.json → res/field/events/events_mt_coronet_3f.json
diff --git a/res/field/events/events_0210.json → ...d/events/events_mt_coronet_4f_room_3.json b/res/field/events/events_0210.json → ...d/events/events_mt_coronet_4f_room_3.json
diff --git a/res/field/events/events_0209.json → ...s/events_mt_coronet_4f_rooms_1_and_2.json b/res/field/events/events_0209.json → ...s/events_mt_coronet_4f_rooms_1_and_2.json
diff --git a/res/field/events/events_0211.json → res/field/events/events_mt_coronet_5f.json b/res/field/events/events_0211.json → res/field/events/events_mt_coronet_5f.json
diff --git a/res/field/events/events_0212.json → res/field/events/events_mt_coronet_6f.json b/res/field/events/events_0212.json → res/field/events/events_mt_coronet_6f.json
diff --git a/res/field/events/events_0216.json → res/field/events/events_mt_coronet_b1f.json b/res/field/events/events_0216.json → res/field/events/events_mt_coronet_b1f.json
diff --git a/res/field/events/events_0530.json → ...ents/events_mt_coronet_iceberg_ruins.json b/res/field/events/events_0530.json → ...ents/events_mt_coronet_iceberg_ruins.json
diff --git a/res/field/events/events_0207.json → ...ents/events_mt_coronet_outside_north.json b/res/field/events/events_0207.json → ...ents/events_mt_coronet_outside_north.json
diff --git a/res/field/events/events_0208.json → ...ents/events_mt_coronet_outside_south.json b/res/field/events/events_0208.json → ...ents/events_mt_coronet_outside_south.json
diff --git a/res/field/events/events_0308.json → res/field/events/events_newmoon_island.json b/res/field/events/events_0308.json → res/field/events/events_newmoon_island.json
diff --git a/res/field/events/events_0309.json → .../events/events_newmoon_island_forest.json b/res/field/events/events_0309.json → .../events/events_newmoon_island_forest.json
diff --git a/res/field/events/events_0284.json → res/field/events/events_old_chateau.json b/res/field/events/events_0284.json → res/field/events/events_old_chateau.json
diff --git a/res/field/events/events_0292.json → ...ts/events_old_chateau_back_east_room.json b/res/field/events/events_0292.json → ...ts/events_old_chateau_back_east_room.json
diff --git a/res/field/events/events_0291.json → ...ts_old_chateau_back_middle_east_room.json b/res/field/events/events_0291.json → ...ts_old_chateau_back_middle_east_room.json
diff --git a/res/field/events/events_0290.json → .../events_old_chateau_back_middle_room.json b/res/field/events/events_0290.json → .../events_old_chateau_back_middle_room.json
diff --git a/res/field/events/events_0289.json → ...ts_old_chateau_back_middle_west_room.json b/res/field/events/events_0289.json → ...ts_old_chateau_back_middle_west_room.json
diff --git a/res/field/events/events_0288.json → ...ts/events_old_chateau_back_west_room.json b/res/field/events/events_0288.json → ...ts/events_old_chateau_back_west_room.json
diff --git a/res/field/events/events_0287.json → ...d/events/events_old_chateau_corridor.json b/res/field/events/events_0287.json → ...d/events/events_old_chateau_corridor.json
diff --git a/res/field/events/events_0285.json → ...vents/events_old_chateau_dining_area.json b/res/field/events/events_0285.json → ...vents/events_old_chateau_dining_area.json
diff --git a/res/field/events/events_0286.json → ...events/events_old_chateau_side_rooms.json b/res/field/events/events_0286.json → ...events/events_old_chateau_side_rooms.json
diff --git a/res/field/events/events_0044.json → res/field/events/events_oreburgh_city.json b/res/field/events/events_0044.json → res/field/events/events_oreburgh_city.json
diff --git a/res/field/events/events_0060.json → ...s/events_oreburgh_city_east_house_1f.json b/res/field/events/events_0060.json → ...s/events_oreburgh_city_east_house_1f.json
diff --git a/res/field/events/events_0061.json → ...s/events_oreburgh_city_east_house_2f.json b/res/field/events/events_0061.json → ...s/events_oreburgh_city_east_house_2f.json
diff --git a/res/field/events/events_0062.json → ...s/events_oreburgh_city_east_house_3f.json b/res/field/events/events_0062.json → ...s/events_oreburgh_city_east_house_3f.json
diff --git a/res/field/events/events_0046.json → ...ield/events/events_oreburgh_city_gym.json b/res/field/events/events_0046.json → ...ield/events/events_oreburgh_city_gym.json
diff --git a/res/field/events/events_0045.json → ...eld/events/events_oreburgh_city_mart.json b/res/field/events/events_0045.json → ...eld/events/events_oreburgh_city_mart.json
diff --git a/res/field/events/events_0057.json → ...ts/events_oreburgh_city_middle_house.json b/res/field/events/events_0057.json → ...ts/events_oreburgh_city_middle_house.json
diff --git a/res/field/events/events_0053.json → .../events_oreburgh_city_north_house_1f.json b/res/field/events/events_0053.json → .../events_oreburgh_city_north_house_1f.json
diff --git a/res/field/events/events_0054.json → .../events_oreburgh_city_north_house_2f.json b/res/field/events/events_0054.json → .../events_oreburgh_city_north_house_2f.json
diff --git a/res/field/events/events_0055.json → .../events_oreburgh_city_north_house_3f.json b/res/field/events/events_0055.json → .../events_oreburgh_city_north_house_3f.json
diff --git a/res/field/events/events_0056.json → .../events_oreburgh_city_north_house_4f.json b/res/field/events/events_0056.json → .../events_oreburgh_city_north_house_4f.json
diff --git a/res/field/events/events_0049.json → ...nts_oreburgh_city_northwest_house_1f.json b/res/field/events/events_0049.json → ...nts_oreburgh_city_northwest_house_1f.json
diff --git a/res/field/events/events_0050.json → ...nts_oreburgh_city_northwest_house_2f.json b/res/field/events/events_0050.json → ...nts_oreburgh_city_northwest_house_2f.json
diff --git a/res/field/events/events_0051.json → ...nts_oreburgh_city_northwest_house_3f.json b/res/field/events/events_0051.json → ...nts_oreburgh_city_northwest_house_3f.json
diff --git a/res/field/events/events_0052.json → ...nts_oreburgh_city_northwest_house_4f.json b/res/field/events/events_0052.json → ...nts_oreburgh_city_northwest_house_4f.json
diff --git a/res/field/events/events_0047.json → ...s/events_oreburgh_city_pokecenter_1f.json b/res/field/events/events_0047.json → ...s/events_oreburgh_city_pokecenter_1f.json
diff --git a/res/field/events/events_0048.json → ...s/events_oreburgh_city_pokecenter_2f.json b/res/field/events/events_0048.json → ...s/events_oreburgh_city_pokecenter_2f.json
diff --git a/res/field/events/events_0453.json → .../events_oreburgh_city_pokecenter_b1f.json b/res/field/events/events_0453.json → .../events_oreburgh_city_pokecenter_b1f.json
diff --git a/res/field/events/events_0063.json → ...nts/events_oreburgh_city_south_house.json b/res/field/events/events_0063.json → ...nts/events_oreburgh_city_south_house.json
diff --git a/res/field/events/events_0059.json → ...ents/events_oreburgh_city_west_house.json b/res/field/events/events_0059.json → ...ents/events_oreburgh_city_west_house.json
diff --git a/res/field/events/events_0251.json → ...field/events/events_oreburgh_gate_1f.json b/res/field/events/events_0251.json → ...field/events/events_oreburgh_gate_1f.json
diff --git a/res/field/events/events_0252.json → ...ield/events/events_oreburgh_gate_b1f.json b/res/field/events/events_0252.json → ...ield/events/events_oreburgh_gate_b1f.json
diff --git a/res/field/events/events_0196.json → ...ield/events/events_oreburgh_mine_b1f.json b/res/field/events/events_0196.json → ...ield/events/events_oreburgh_mine_b1f.json
diff --git a/res/field/events/events_0197.json → ...ield/events/events_oreburgh_mine_b2f.json b/res/field/events/events_0197.json → ...ield/events/events_oreburgh_mine_b2f.json
diff --git a/res/field/events/events_0245.json → res/field/events/events_pal_park.json b/res/field/events/events_0245.json → res/field/events/events_pal_park.json
diff --git a/res/field/events/events_0379.json → res/field/events/events_pal_park_lobby.json b/res/field/events/events_0379.json → res/field/events/events_pal_park_lobby.json
diff --git a/res/field/events/events_0119.json → res/field/events/events_pastoria_city.json b/res/field/events/events_0119.json → res/field/events/events_pastoria_city.json
diff --git a/res/field/events/events_0195.json → .../events_pastoria_city_dp_great_marsh.json b/res/field/events/events_0195.json → .../events_pastoria_city_dp_great_marsh.json
diff --git a/res/field/events/events_0128.json → ...ents/events_pastoria_city_east_house.json b/res/field/events/events_0128.json → ...ents/events_pastoria_city_east_house.json
diff --git a/res/field/events/events_0121.json → ...ield/events/events_pastoria_city_gym.json b/res/field/events/events_0121.json → ...ield/events/events_pastoria_city_gym.json
diff --git a/res/field/events/events_0120.json → ...eld/events/events_pastoria_city_mart.json b/res/field/events/events_0120.json → ...eld/events/events_pastoria_city_mart.json
diff --git a/res/field/events/events_0127.json → ...ts/events_pastoria_city_middle_house.json b/res/field/events/events_0127.json → ...ts/events_pastoria_city_middle_house.json
diff --git a/res/field/events/events_0129.json → ...nts/events_pastoria_city_north_house.json b/res/field/events/events_0129.json → ...nts/events_pastoria_city_north_house.json
diff --git a/res/field/events/events_0130.json → ...events_pastoria_city_northeast_house.json b/res/field/events/events_0130.json → ...events_pastoria_city_northeast_house.json
diff --git a/res/field/events/events_0124.json → ...ts_pastoria_city_observatory_gate_1f.json b/res/field/events/events_0124.json → ...ts_pastoria_city_observatory_gate_1f.json
diff --git a/res/field/events/events_0125.json → ...ts_pastoria_city_observatory_gate_2f.json b/res/field/events/events_0125.json → ...ts_pastoria_city_observatory_gate_2f.json
diff --git a/res/field/events/events_0122.json → ...s/events_pastoria_city_pokecenter_1f.json b/res/field/events/events_0122.json → ...s/events_pastoria_city_pokecenter_1f.json
diff --git a/res/field/events/events_0123.json → ...s/events_pastoria_city_pokecenter_2f.json b/res/field/events/events_0123.json → ...s/events_pastoria_city_pokecenter_2f.json
diff --git a/res/field/events/events_0456.json → .../events_pastoria_city_pokecenter_b1f.json b/res/field/events/events_0456.json → .../events_pastoria_city_pokecenter_b1f.json
diff --git a/res/field/events/events_0126.json → ...events_pastoria_city_southwest_house.json b/res/field/events/events_0126.json → ...events_pastoria_city_southwest_house.json
diff --git a/res/field/events/events_0115.json → res/field/events/events_poffin_house.json b/res/field/events/events_0115.json → res/field/events/events_poffin_house.json
diff --git a/res/field/events/events_0416.json → ...field/events/events_pokemon_day_care.json b/res/field/events/events_0416.json → ...field/events/events_pokemon_day_care.json
diff --git a/res/field/events/events_0171.json → res/field/events/events_pokemon_league.json b/res/field/events/events_0171.json → res/field/events/events_pokemon_league.json
diff --git a/res/field/events/events_0176.json → ...nts/events_pokemon_league_aaron_room.json b/res/field/events/events_0176.json → ...nts/events_pokemon_league_aaron_room.json
diff --git a/res/field/events/events_0178.json → ...ts/events_pokemon_league_bertha_room.json b/res/field/events/events_0178.json → ...ts/events_pokemon_league_bertha_room.json
diff --git a/res/field/events/events_0184.json → .../events_pokemon_league_champion_room.json b/res/field/events/events_0184.json → .../events_pokemon_league_champion_room.json
diff --git a/res/field/events/events_0175.json → ...okemon_league_elevator_to_aaron_room.json b/res/field/events/events_0175.json → ...okemon_league_elevator_to_aaron_room.json
diff --git a/res/field/events/events_0177.json → ...kemon_league_elevator_to_bertha_room.json b/res/field/events/events_0177.json → ...kemon_league_elevator_to_bertha_room.json
diff --git a/res/field/events/events_0183.json → ...mon_league_elevator_to_champion_room.json b/res/field/events/events_0183.json → ...mon_league_elevator_to_champion_room.json
diff --git a/res/field/events/events_0179.json → ...okemon_league_elevator_to_flint_room.json b/res/field/events/events_0179.json → ...okemon_league_elevator_to_flint_room.json
diff --git a/res/field/events/events_0185.json → ...emon_league_elevator_to_hall_of_fame.json b/res/field/events/events_0185.json → ...emon_league_elevator_to_hall_of_fame.json
diff --git a/res/field/events/events_0181.json → ...kemon_league_elevator_to_lucian_room.json b/res/field/events/events_0181.json → ...kemon_league_elevator_to_lucian_room.json
diff --git a/res/field/events/events_0180.json → ...nts/events_pokemon_league_flint_room.json b/res/field/events/events_0180.json → ...nts/events_pokemon_league_flint_room.json
diff --git a/res/field/events/events_0186.json → ...s/events_pokemon_league_hall_of_fame.json b/res/field/events/events_0186.json → ...s/events_pokemon_league_hall_of_fame.json
diff --git a/res/field/events/events_0182.json → ...ts/events_pokemon_league_lucian_room.json b/res/field/events/events_0182.json → ...ts/events_pokemon_league_lucian_room.json
diff --git a/res/field/events/events_0174.json → ...s_pokemon_league_north_pokecenter_1f.json b/res/field/events/events_0174.json → ...s_pokemon_league_north_pokecenter_1f.json
diff --git a/res/field/events/events_0472.json → ...s_pokemon_league_north_pokecenter_2f.json b/res/field/events/events_0472.json → ...s_pokemon_league_north_pokecenter_2f.json
diff --git a/res/field/events/events_0473.json → ..._pokemon_league_north_pokecenter_b1f.json b/res/field/events/events_0473.json → ..._pokemon_league_north_pokecenter_b1f.json
diff --git a/res/field/events/events_0172.json → ...s_pokemon_league_south_pokecenter_1f.json b/res/field/events/events_0172.json → ...s_pokemon_league_south_pokecenter_1f.json
diff --git a/res/field/events/events_0173.json → ...s_pokemon_league_south_pokecenter_2f.json b/res/field/events/events_0173.json → ...s_pokemon_league_south_pokecenter_2f.json
diff --git a/res/field/events/events_0460.json → ..._pokemon_league_south_pokecenter_b1f.json b/res/field/events/events_0460.json → ..._pokemon_league_south_pokecenter_b1f.json
diff --git a/res/field/events/events_0354.json → res/field/events/events_pokemon_mansion.json b/res/field/events/events_0354.json → res/field/events/events_pokemon_mansion.json
diff --git a/res/field/events/events_0355.json → ...ts/events_pokemon_mansion_maids_room.json b/res/field/events/events_0355.json → ...ts/events_pokemon_mansion_maids_room.json
diff --git a/res/field/events/events_0356.json → ...events/events_pokemon_mansion_office.json b/res/field/events/events_0356.json → ...events/events_pokemon_mansion_office.json
diff --git a/res/field/events/events_0007.json → res/field/events/events_poketch_co_1f.json b/res/field/events/events_0007.json → res/field/events/events_poketch_co_1f.json
diff --git a/res/field/events/events_0008.json → res/field/events/events_poketch_co_2f.json b/res/field/events/events_0008.json → res/field/events/events_poketch_co_2f.json
diff --git a/res/field/events/events_0009.json → res/field/events/events_poketch_co_3f.json b/res/field/events/events_0009.json → res/field/events/events_poketch_co_3f.json
diff --git a/res/field/events/events_0247.json → res/field/events/events_ravaged_path.json b/res/field/events/events_0247.json → res/field/events/events_ravaged_path.json
diff --git a/res/field/events/events_0436.json → res/field/events/events_resort_area.json b/res/field/events/events_0436.json → res/field/events/events_resort_area.json
diff --git a/res/field/events/events_0444.json → ...ield/events/events_resort_area_house.json b/res/field/events/events_0444.json → ...ield/events/events_resort_area_house.json
diff --git a/res/field/events/events_0437.json → ...field/events/events_resort_area_mart.json b/res/field/events/events_0437.json → ...field/events/events_resort_area_mart.json
diff --git a/res/field/events/events_0438.json → ...nts/events_resort_area_pokecenter_1f.json b/res/field/events/events_0438.json → ...nts/events_resort_area_pokecenter_1f.json
diff --git a/res/field/events/events_0439.json → ...nts/events_resort_area_pokecenter_2f.json b/res/field/events/events_0439.json → ...nts/events_resort_area_pokecenter_2f.json
diff --git a/res/field/events/events_0467.json → ...ts/events_resort_area_pokecenter_b1f.json b/res/field/events/events_0467.json → ...ts/events_resort_area_pokecenter_b1f.json
diff --git a/res/field/events/events_0440.json → ...ents_resort_area_ribbon_syndicate_1f.json b/res/field/events/events_0440.json → ...ents_resort_area_ribbon_syndicate_1f.json
diff --git a/res/field/events/events_0441.json → ...ents_resort_area_ribbon_syndicate_2f.json b/res/field/events/events_0441.json → ...ents_resort_area_ribbon_syndicate_2f.json
diff --git a/res/field/events/events_0141.json → ...esort_area_ribbon_syndicate_elevator.json b/res/field/events/events_0141.json → ...esort_area_ribbon_syndicate_elevator.json
diff --git a/res/field/events/events_0323.json → res/field/events/events_restaurant.json b/res/field/events/events_0323.json → res/field/events/events_restaurant.json