From 8b8df9fa330e36c0eb4379e084f3e411b1001690 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Thu, 18 Apr 2024 10:51:49 -0600
Subject: [PATCH] Pokemon Emerald: Fix missing region for water encounters in
 Dewford (#3103)

---
 worlds/pokemon_emerald/data/regions/cities.json | 13 ++++++++++++-
 worlds/pokemon_emerald/rules.py                 |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/worlds/pokemon_emerald/data/regions/cities.json b/worlds/pokemon_emerald/data/regions/cities.json
index 063fb6a1..2bd21e16 100644
--- a/worlds/pokemon_emerald/data/regions/cities.json
+++ b/worlds/pokemon_emerald/data/regions/cities.json
@@ -1143,7 +1143,7 @@
   "REGION_DEWFORD_TOWN/MAIN": {
     "parent_map": "MAP_DEWFORD_TOWN",
     "has_grass": false,
-    "has_water": true,
+    "has_water": false,
     "has_fishing": true,
     "locations": [
       "NPC_GIFT_RECEIVED_OLD_ROD"
@@ -1152,6 +1152,7 @@
       "EVENT_VISITED_DEWFORD_TOWN"
     ],
     "exits": [
+      "REGION_DEWFORD_TOWN/WATER",
       "REGION_ROUTE106/EAST",
       "REGION_ROUTE107/MAIN",
       "REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN",
@@ -1165,6 +1166,16 @@
       "MAP_DEWFORD_TOWN:4/MAP_DEWFORD_TOWN_HOUSE2:0"
     ]
   },
+  "REGION_DEWFORD_TOWN/WATER": {
+    "parent_map": "MAP_DEWFORD_TOWN",
+    "has_grass": false,
+    "has_water": true,
+    "has_fishing": true,
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": []
+  },
   "REGION_DEWFORD_TOWN_HALL/MAIN": {
     "parent_map": "MAP_DEWFORD_TOWN_HALL",
     "has_grass": false,
diff --git a/worlds/pokemon_emerald/rules.py b/worlds/pokemon_emerald/rules.py
index 0b5c6b79..816fbdd0 100644
--- a/worlds/pokemon_emerald/rules.py
+++ b/worlds/pokemon_emerald/rules.py
@@ -427,6 +427,10 @@ def set_rules(world: "PokemonEmeraldWorld") -> None:
             state.can_reach("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN", "Entrance", world.player)
             and state.has("EVENT_TALK_TO_MR_STONE", world.player)
     )
+    set_rule(
+        get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_DEWFORD_TOWN/WATER"),
+        hm_rules["HM03 Surf"]
+    )
 
     # Granite Cave
     set_rule(