Merge branch 'main' into Items-Panel

Author: AarCon

__gamedata/encounter_locations.json

@@ -19,6 +19,7 @@ import trainerLocations from './Mapper_Trainer_Output.json';
 import field_items from './item_list.json';
 import hidden_items from './hide_item_list.json';
 import staticLocations from './static_pokemon_locations.json';
+import staticAreaLocations from './static_area_locations.json';
 
 //All the Pokemon english files
 import basePokemonNames from './english_ss_monsname.json';
@@ -61,6 +62,7 @@ export {
   pokemonPokedexInfo,
   pokemonLocations,
   staticLocations,
+  staticAreaLocations,
   natureNames,
   abilityNames,
   abilityInfo,