From b20d671b7a30ea6574ff7411355d47b5a8238d35 Mon Sep 17 00:00:00 2001
From: ItsMejoji <itsmejojitcg@gmail.com>
Date: Wed, 4 Mar 2026 09:32:23 -0800
Subject: [PATCH 01/14] Added Mirage Island Encounters

---
 data/v2/csv/encounter_slots.csv | 10 ++++++
 data/v2/csv/encounters.csv      | 56 +++++++++++++++++++++++++++++++++
 data/v2/csv/location_areas.csv  |  8 +++++
 3 files changed, 74 insertions(+)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index ad8dec736..7e39df19e 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1346,3 +1346,13 @@ id,version_group_id,encounter_method_id,slot,rarity
 1345,5,46,,100
 1346,6,46,,100
 1347,7,46,,100
+1348,16,1,1,30
+1349,16,1,2,30
+1350,16,1,3,30
+1351,16,1,4,10
+1352,16,1,1,60
+1353,16,1,2,40
+1354,16,1,1,90
+1355,16,1,2,10
+1356,16,6,1,85
+1357,16,6,2,15
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 80d84001b..be76577ac 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65257,3 +65257,59 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70816,9,1205,196,363,32,32
 70817,9,1205,197,42,32,32
 70818,9,1205,198,363,32,32
+70819,25,1215,1348,114,36,38
+70820,25,1215,1349,178,36,38
+70821,25,1215,1350,523,36,38
+70822,25,1215,1351,49,36,38
+70823,26,1215,1348,114,36,38
+70824,26,1215,1349,178,36,38
+70825,26,1215,1350,523,36,38
+70826,26,1215,1351,49,36,38
+70827,25,1216,1348,49,36,38
+70828,25,1216,1349,178,36,38
+70829,25,1216,1350,523,36,38
+70830,25,1216,1351,555,36,38
+70831,26,1216,1348,49,36,38
+70832,26,1216,1349,178,36,38
+70833,26,1216,1350,523,36,38
+70834,26,1216,1351,555,36,38
+70835,25,1217,1352,555,36,38
+70836,25,1217,1353,636,36,38
+70837,26,1217,1352,555,36,38
+70838,26,1217,1353,636,36,38
+70839,25,1218,1348,49,36,38
+70840,25,1218,1349,178,36,38
+70841,25,1218,1350,523,36,38
+70842,25,1218,1351,53,36,38
+70843,26,1218,1348,49,36,38
+70844,26,1218,1349,178,36,38
+70845,26,1218,1350,523,36,38
+70846,26,1218,1351,53,36,38
+70847,25,1219,1352,517,36,38
+70848,25,1219,1353,132,36,38
+70849,26,1219,1352,517,36,38
+70850,26,1219,1353,132,36,38
+70851,25,1220,1348,49,36,38
+70852,25,1220,1349,178,36,38
+70853,25,1220,1350,523,36,38
+70854,25,1220,1351,556,36,38
+70855,26,1220,1348,49,36,38
+70856,26,1220,1349,178,36,38
+70857,26,1220,1350,523,36,38
+70858,26,1220,1351,556,36,38
+70859,25,1221,1356,75,38,38
+70860,25,1221,1357,688,37,37
+70861,26,1221,1356,75,38,38
+70862,26,1221,1357,688,37,37
+70863,25,1222,1354,531,36,38
+70864,25,1222,1355,178,36,38
+70865,26,1222,1354,531,36,38
+70866,26,1222,1355,178,36,38
+70867,25,1222,1356,75,38,38
+70868,25,1222,1357,688,37,37
+70869,26,1222,1356,75,38,38
+70870,26,1222,1357,688,37,37
+70863,25,1223,1352,432,36,38
+70864,25,1223,1353,137,36,38
+70865,26,1223,1352,432,36,38
+70866,26,1223,1353,137,36,38
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 4fa0ad268..86b4dc3e1 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1103,3 +1103,11 @@ id,location_id,game_index,identifier
 1212,1091,0,
 1213,1092,0,
 1214,1093,0,
+1215,577,0,west-of-dewford-town
+1216,577,0,west-of-route-104
+1217,577,0,route-114
+1218,577,0,route-124
+1219,577,0,route-132
+1220,577,0,south-of-route-134
+1221,577,0,south-of-pacifidlog
+1222,577,0,east-of-shoal-cave
\ No newline at end of file

From b6f603be84ccf943ae907edf953f3a41e28b8967 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Wed, 4 Mar 2026 10:04:03 -0800
Subject: [PATCH 02/14] Updated IDs

I realized after creating this PR that the IDs in the encounter.csv were incorrect at the end of it.
---
 data/v2/csv/encounters.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index be76577ac..78debf4dc 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65309,7 +65309,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70868,25,1222,1357,688,37,37
 70869,26,1222,1356,75,38,38
 70870,26,1222,1357,688,37,37
-70863,25,1223,1352,432,36,38
-70864,25,1223,1353,137,36,38
-70865,26,1223,1352,432,36,38
-70866,26,1223,1353,137,36,38
+70871,25,1223,1352,432,36,38
+70872,25,1223,1353,137,36,38
+70873,26,1223,1352,432,36,38
+70874,26,1223,1353,137,36,38

From 47c96679634c732e77ccf0e3b4793978afbe1857 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Wed, 4 Mar 2026 11:30:34 -0800
Subject: [PATCH 03/14] Correct encounter entries with correct location-area
 ids

---
 data/v2/csv/encounters.csv | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 78debf4dc..09b923dd1 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65297,19 +65297,19 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70856,26,1220,1349,178,36,38
 70857,26,1220,1350,523,36,38
 70858,26,1220,1351,556,36,38
-70859,25,1221,1356,75,38,38
-70860,25,1221,1357,688,37,37
-70861,26,1221,1356,75,38,38
-70862,26,1221,1357,688,37,37
-70863,25,1222,1354,531,36,38
-70864,25,1222,1355,178,36,38
-70865,26,1222,1354,531,36,38
-70866,26,1222,1355,178,36,38
-70867,25,1222,1356,75,38,38
-70868,25,1222,1357,688,37,37
-70869,26,1222,1356,75,38,38
-70870,26,1222,1357,688,37,37
-70871,25,1223,1352,432,36,38
-70872,25,1223,1353,137,36,38
-70873,26,1223,1352,432,36,38
-70874,26,1223,1353,137,36,38
+70859,25,1220,1356,75,38,38
+70860,25,1220,1357,688,37,37
+70861,26,1220,1356,75,38,38
+70862,26,1220,1357,688,37,37
+70863,25,1221,1354,531,36,38
+70864,25,1221,1355,178,36,38
+70865,26,1221,1354,531,36,38
+70866,26,1221,1355,178,36,38
+70867,25,1221,1356,75,38,38
+70868,25,1221,1357,688,37,37
+70869,26,1221,1356,75,38,38
+70870,26,1221,1357,688,37,37
+70871,25,1222,1352,432,36,38
+70872,25,1222,1353,137,36,38
+70873,26,1222,1352,432,36,38
+70874,26,1222,1353,137,36,38

From 05e02d2085e1a663af0175e1f0bc1b8e01cb5fc2 Mon Sep 17 00:00:00 2001
From: ItsMejoji <itsmejojitcg@gmail.com>
Date: Thu, 5 Mar 2026 11:55:49 -0800
Subject: [PATCH 04/14] Updated to include Gen 3 Mirage Island data and
 location-are-prose info

---
 data/v2/csv/encounter_slots.csv     |  4 +++-
 data/v2/csv/encounters.csv          | 35 ++++++++++++++++-------------
 data/v2/csv/location_area_prose.csv | 11 ++++++++-
 data/v2/csv/location_areas.csv      | 17 +++++++-------
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 7e39df19e..7dabbcac1 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1355,4 +1355,6 @@ id,version_group_id,encounter_method_id,slot,rarity
 1354,16,1,1,90
 1355,16,1,2,10
 1356,16,6,1,85
-1357,16,6,2,15
\ No newline at end of file
+1357,16,6,2,15
+1358,5,6,1,100
+1359,6,6,2,100
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index be76577ac..d46573149 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65297,19 +65297,22 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70856,26,1220,1349,178,36,38
 70857,26,1220,1350,523,36,38
 70858,26,1220,1351,556,36,38
-70859,25,1221,1356,75,38,38
-70860,25,1221,1357,688,37,37
-70861,26,1221,1356,75,38,38
-70862,26,1221,1357,688,37,37
-70863,25,1222,1354,531,36,38
-70864,25,1222,1355,178,36,38
-70865,26,1222,1354,531,36,38
-70866,26,1222,1355,178,36,38
-70867,25,1222,1356,75,38,38
-70868,25,1222,1357,688,37,37
-70869,26,1222,1356,75,38,38
-70870,26,1222,1357,688,37,37
-70863,25,1223,1352,432,36,38
-70864,25,1223,1353,137,36,38
-70865,26,1223,1352,432,36,38
-70866,26,1223,1353,137,36,38
+70859,25,1220,1356,75,38,38
+70860,25,1220,1357,688,37,37
+70861,26,1220,1356,75,38,38
+70862,26,1220,1357,688,37,37
+70863,25,1221,1354,531,36,38
+70864,25,1221,1355,178,36,38
+70865,26,1221,1354,531,36,38
+70866,26,1221,1355,178,36,38
+70867,25,1221,1356,75,38,38
+70868,25,1221,1357,688,37,37
+70869,26,1221,1356,75,38,38
+70870,26,1221,1357,688,37,37
+70871,25,1222,1352,432,36,38
+70872,25,1222,1353,137,36,38
+70873,26,1222,1352,432,36,38
+70874,26,1222,1353,137,36,38
+70875,7,1223,1358,360,5,50
+70876,8,1223,1358,360,5,50
+70877,9,1223,1359,360,5,50
\ No newline at end of file
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index f708f2a91..470b13763 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2268,4 +2268,13 @@ location_area_id,local_language_id,name
 1198,5,Ultra-Dimension Zéro Monde Grotte
 1199,9,Mount Lanakila Crater
 1199,6,Mount Lanakila Krater
-1199,5,Mont Lanakila Cratère
\ No newline at end of file
+1199,5,Mont Lanakila Cratère
+1215,9,Mirage Island (West Of Dewford Town)
+1216,9,Mirage Island (West Of Route 104)
+1217,9,Mirage Island (Route 114)
+1218,9,Mirage Island (Route 124)
+1219,9,Mirage Island (Route 132)
+1220,9,Mirage Island (South of Route 134)
+1221,9,Mirage Island (South of Pacofidlog)
+1222,9,Mirage Island (East of Shoal Cave)
+1223,9,Mirage Island
\ No newline at end of file
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 86b4dc3e1..be8e5b8c4 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1103,11 +1103,12 @@ id,location_id,game_index,identifier
 1212,1091,0,
 1213,1092,0,
 1214,1093,0,
-1215,577,0,west-of-dewford-town
-1216,577,0,west-of-route-104
-1217,577,0,route-114
-1218,577,0,route-124
-1219,577,0,route-132
-1220,577,0,south-of-route-134
-1221,577,0,south-of-pacifidlog
-1222,577,0,east-of-shoal-cave
\ No newline at end of file
+1215,1094,0,west-of-dewford-town
+1216,1094,0,west-of-route-104
+1217,1094,0,route-114
+1218,1094,0,route-124
+1219,1094,0,route-132
+1220,1094,0,south-of-route-134
+1221,1094,0,south-of-pacifidlog
+1222,1094,0,east-of-shoal-cave
+1223,577,0,
\ No newline at end of file

From 96a8fe98d08834ba87fb51c465edb7d22fed3e7a Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Thu, 5 Mar 2026 11:59:12 -0800
Subject: [PATCH 05/14] Resolve merge conflict in encounters.csv

---
 data/v2/csv/encounters.csv | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 96cd974a8..950b8ba5b 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65313,9 +65313,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70872,25,1222,1353,137,36,38
 70873,26,1222,1352,432,36,38
 70874,26,1222,1353,137,36,38
-<<<<<<< HEAD
 70875,7,1223,1358,360,5,50
 70876,8,1223,1358,360,5,50
 70877,9,1223,1359,360,5,50
-=======
->>>>>>> 47c96679634c732e77ccf0e3b4793978afbe1857

From 50583724c50a6b65300d280f3330305ab844cd12 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Thu, 5 Mar 2026 12:00:44 -0800
Subject: [PATCH 06/14] Removed personal changes in Makefile

Removed --break-system-packages option from install and dev-install commands. Usually need this for my own machine.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 35461760d..3f772660d 100755
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,10 @@ help:
 	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 install:  # Install base requirements to run project
-	$(PIP) install -r requirements.txt --break-system-packages
+	$(PIP) install -r requirements.txt
 
 dev-install:  # Install developer requirements + base requirements
-	$(PIP) install -r test-requirements.txt --break-system-packages
+	$(PIP) install -r test-requirements.txt
 
 setup:  # Set up the project database
 	$(PYTHON) manage.py migrate ${local_config}

From 4b01dfa572405c214909226435e59246fcf8cd5d Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Thu, 5 Mar 2026 13:24:06 -0800
Subject: [PATCH 07/14] Correct Wynaut Encounter Method

---
 data/v2/csv/encounter_slots.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 7dabbcac1..4174c0e21 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1356,5 +1356,5 @@ id,version_group_id,encounter_method_id,slot,rarity
 1355,16,1,2,10
 1356,16,6,1,85
 1357,16,6,2,15
-1358,5,6,1,100
-1359,6,6,2,100
\ No newline at end of file
+1358,5,1,1,100
+1359,6,1,2,100

From 2a31801457014852a4f3585b08257cae9943b933 Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 6 Mar 2026 10:37:48 -0800
Subject: [PATCH 08/14] Flip Mirage Island Location IDs

---
 data/v2/csv/location_areas.csv | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index be8e5b8c4..700e7bdec 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1103,12 +1103,12 @@ id,location_id,game_index,identifier
 1212,1091,0,
 1213,1092,0,
 1214,1093,0,
-1215,1094,0,west-of-dewford-town
-1216,1094,0,west-of-route-104
-1217,1094,0,route-114
-1218,1094,0,route-124
-1219,1094,0,route-132
-1220,1094,0,south-of-route-134
-1221,1094,0,south-of-pacifidlog
-1222,1094,0,east-of-shoal-cave
-1223,577,0,
\ No newline at end of file
+1215,577,0,west-of-dewford-town
+1216,577,0,west-of-route-104
+1217,577,0,route-114
+1218,577,0,route-124
+1219,577,0,route-132
+1220,577,0,south-of-route-134
+1221,577,0,south-of-pacifidlog
+1222,577,0,east-of-shoal-cave
+1223,1094,0,

From ba311c43742cfeb28713199960e6116ada0350cd Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Fri, 6 Mar 2026 10:38:48 -0800
Subject: [PATCH 09/14] Flipped Mirage Island names

---
 data/v2/csv/locations.csv | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index 6ac1c9b4b..f20090dfa 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -558,7 +558,7 @@ id,region_id,identifier
 574,3,fortree-city
 575,3,underwater
 576,3,mt-chimney
-577,3,mirage-island
+577,3,mirage-spot-island
 578,3,southern-island
 579,3,sealed-chamber
 580,3,scorched-slab
@@ -678,9 +678,9 @@ id,region_id,identifier
 694,3,team-magma-hideout
 695,3,battle-resort
 696,3,ss-tidal
-697,3,mirage-forest
-698,3,mirage-cave
-699,3,mirage-mountain
+697,3,mirage-spot-forest
+698,3,mirage-spot-cave
+699,3,mirage-spot-mountain
 700,3,trackless-forest
 701,3,pathless-plain
 702,3,nameless-cavern
@@ -1075,4 +1075,4 @@ id,region_id,identifier
 1091,1,kanto-pokecenter
 1092,4,sinnoh-pokemart
 1093,2,johto-pokemart
-1094,3,mirage-island-oras
\ No newline at end of file
+1094,3,mirage-island

From 8f4ecfcdbd8ebcae3a16728b65dd7971f174d0c0 Mon Sep 17 00:00:00 2001
From: ItsMejoji <itsmejojitcg@gmail.com>
Date: Thu, 12 Mar 2026 16:38:10 -0700
Subject: [PATCH 10/14] ORAS Mirage Forest Encounters

---
 data/v2/csv/encounter_slots.csv     |  4 +++
 data/v2/csv/encounters.csv          | 52 +++++++++++++++++++++++++++++
 data/v2/csv/location_area_prose.csv | 10 +++++-
 data/v2/csv/location_areas.csv      |  8 +++++
 4 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 4174c0e21..992cf92aa 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1358,3 +1358,7 @@ id,version_group_id,encounter_method_id,slot,rarity
 1357,16,6,2,15
 1358,5,1,1,100
 1359,6,1,2,100
+1360,16,1,1,60
+1361,16,1,2,30
+1362,16,1,3,10
+1363,16,6,1,100
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 950b8ba5b..f14dbd11f 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65316,3 +65316,55 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70875,7,1223,1358,360,5,50
 70876,8,1223,1358,360,5,50
 70877,9,1223,1359,360,5,50
+70878,25,1224,1348,114,36,38
+70879,25,1224,1349,191,36,38
+70880,25,1224,1350,432,36,38
+70881,25,1224,1351,421,36,38
+70882,26,1224,1348,114,36,38
+70883,26,1224,1349,191,36,38
+70884,26,1224,1350,432,36,38
+70885,26,1224,1351,421,36,38
+70886,25,1225,1360,191,36,38
+70887,25,1225,1361,548,36,38
+70888,25,1225,1362,531,36,38
+70889,26,1225,1360,191,36,38
+70890,26,1225,1361,548,36,38
+70891,26,1225,1362,531,36,38
+70892,25,1226,1348,114,36,38
+70893,25,1226,1349,191,36,38
+70894,25,1226,1350,431,36,38
+70895,25,1226,1351,572,36,38
+70896,26,1226,1348,114,36,38
+70897,26,1226,1349,191,36,38
+70898,26,1226,1350,431,36,38
+70899,26,1226,1351,572,36,38
+70900,25,1227,1354,531,36,38
+70901,25,1227,1355,191,36,38
+70902,26,1227,1354,531,36,38
+70903,26,1227,1355,191,36,38
+70904,25,1228,1348,114,36,38
+70905,25,1228,1349,191,36,38
+70906,25,1228,1350,431,36,38
+70907,25,1228,1351,37,36,38
+70908,26,1228,1348,114,36,38
+70909,26,1228,1349,191,36,38
+70910,26,1228,1350,431,36,38
+70911,26,1228,1351,37,36,38
+70912,25,1229,1348,114,36,38
+70913,25,1229,1349,191,36,38
+70914,25,1229,1350,431,36,38
+70915,25,1229,1351,548,36,38
+70916,26,1229,1348,114,36,38
+70917,26,1229,1349,191,36,38
+70918,26,1229,1350,431,36,38
+70919,26,1229,1351,548,36,38
+70920,25,1230,1352,205,36,38
+70921,25,1230,1353,440,36,38
+70922,26,1230,1352,205,36,38
+70923,26,1230,1353,440,36,38
+70924,25,1230,1363,75,36,38
+70925,26,1230,1363,75,36,38
+70926,25,1231,1352,402,36,38
+70927,25,1231,1353,636,36,38
+70928,26,1231,1352,402,36,38
+70929,26,1231,1353,636,36,38
\ No newline at end of file
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 470b13763..85703ef08 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2277,4 +2277,12 @@ location_area_id,local_language_id,name
 1220,9,Mirage Island (South of Route 134)
 1221,9,Mirage Island (South of Pacofidlog)
 1222,9,Mirage Island (East of Shoal Cave)
-1223,9,Mirage Island
\ No newline at end of file
+1223,9,Mirage Island
+1224,9,Mirage Forest (North of Lilycove)
+1225,9,Mirage Forest (South of Route 132)
+1226,9,Mirage Forest (East of Mossdeep)
+1227,9,Mirage Forest (South of Route 109)
+1228,9,Mirage Forest (North of Route 124)
+1229,9,Mirage Forest (West of Route 114)
+1230,9,Mirage Forest (West of Route 105)
+1231,9,Mirage Forest (South of Route 111)
\ No newline at end of file
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 700e7bdec..d1a83101e 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1112,3 +1112,11 @@ id,location_id,game_index,identifier
 1221,577,0,south-of-pacifidlog
 1222,577,0,east-of-shoal-cave
 1223,1094,0,
+1224,697,0,north-of-lilycove
+1225,697,0,south-of-route-132
+1226,697,0,east-of-mossdeep
+1227,697,0,south-of-route-109
+1228,697,0,north-of-route-124
+1229,697,0,west-of-route-114
+1230,697,0,west-of-route-105
+1231,697,0,south-of-route-111
\ No newline at end of file

From a282e91cbf257ebc30f334733cf05b9de2464340 Mon Sep 17 00:00:00 2001
From: ItsMejoji <itsmejojitcg@gmail.com>
Date: Wed, 18 Mar 2026 14:49:57 -0700
Subject: [PATCH 11/14] Correct Purugly Encounters

---
 data/v2/csv/encounters.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index f14dbd11f..c96392392 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65344,19 +65344,19 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70903,26,1227,1355,191,36,38
 70904,25,1228,1348,114,36,38
 70905,25,1228,1349,191,36,38
-70906,25,1228,1350,431,36,38
+70906,25,1228,1350,432,36,38
 70907,25,1228,1351,37,36,38
 70908,26,1228,1348,114,36,38
 70909,26,1228,1349,191,36,38
-70910,26,1228,1350,431,36,38
+70910,26,1228,1350,432,36,38
 70911,26,1228,1351,37,36,38
 70912,25,1229,1348,114,36,38
 70913,25,1229,1349,191,36,38
-70914,25,1229,1350,431,36,38
+70914,25,1229,1350,432,36,38
 70915,25,1229,1351,548,36,38
 70916,26,1229,1348,114,36,38
 70917,26,1229,1349,191,36,38
-70918,26,1229,1350,431,36,38
+70918,26,1229,1350,432,36,38
 70919,26,1229,1351,548,36,38
 70920,25,1230,1352,205,36,38
 70921,25,1230,1353,440,36,38

From 1418275a23ec273b0cf6557175a53af48ee79585 Mon Sep 17 00:00:00 2001
From: ItsMejoji <itsmejojitcg@gmail.com>
Date: Mon, 23 Mar 2026 12:25:12 -0700
Subject: [PATCH 12/14] ORAS Mirage Cave and Mountain Encounters

---
 data/v2/csv/encounter_slots.csv     |   6 ++
 data/v2/csv/encounters.csv          | 114 +++++++++++++++++++++++++++-
 data/v2/csv/location_area_prose.csv |  16 ++++
 data/v2/csv/location_areas.csv      |  24 +++++-
 4 files changed, 152 insertions(+), 8 deletions(-)

diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 5f4677f4c..f7f63f201 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1365,3 +1365,9 @@ id,version_group_id,encounter_method_id,slot,rarity
 1364,12,51,,100
 1365,12,18,,100
 1366,12,52,,100
+1367,16,1,1,40
+1368,16,1,2,30
+1369,16,1,3,30
+1370,16,1,1,40
+1371,16,1,2,60
+1372,16,1,1,100
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 1a8bb7484..1ebcf1686 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65398,7 +65398,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70957,19,1246,1364,307,33,33
 70958,19,1247,1364,333,33,33
 70959,19,1248,1366,185,35,35
-70960,19,1242,1364,185,35,35
+70960,19,1249,1364,185,35,35
 70961,19,1250,1365,311,13,13
 70962,19,1234,1366,237,38,38
 70963,19,1251,1366,237,38,38
@@ -65406,8 +65406,8 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70965,19,1248,1366,244,40,40
 70966,19,1260,1366,244,40,40
 70967,19,1254,1364,244,40,40
-70968,19,1234,1366,166,40,40
-70969,19,1255,1364,166,40,40
+70968,19,1234,1366,166,43,43
+70969,19,1255,1364,166,43,43
 70970,19,1248,1366,245,40,40
 70971,19,1260,1366,245,40,40
 70972,19,1256,1364,245,40,40
@@ -65443,7 +65443,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71002,19,1259,1364,376,50,50
 71003,19,1259,1364,248,55,55
 71004,19,1258,1364,235,45,45
-71005,19,1258,1364,217,45,45
+71005,19,1258,1364,218,45,45
 71006,19,1260,1364,213,45,45
 71007,19,1232,1364,176,20,20
 71008,19,1261,1365,250,70,70
@@ -65451,3 +65451,109 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71010,19,1262,1364,179,37,37
 71011,19,1262,1364,212,50,50
 71012,19,1260,1366,185,35,35
+71013,25,1263,1360,602,36,38
+71014,25,1263,1361,563,36,38
+71015,25,1263,1362,79,36,38
+71016,26,1263,1360,602,36,38
+71017,26,1263,1361,563,36,38
+71018,26,1263,1362,79,36,38
+71019,25,1264,1367,132,36,38
+71020,25,1264,1368,530,36,38
+71021,25,1264,1369,602,36,38
+71022,26,1264,1367,132,36,38
+71023,26,1264,1368,530,36,38
+71024,26,1264,1369,602,36,38
+71025,25,1265,1370,79,36,38
+71026,25,1265,1371,602,36,38
+71027,26,1265,1370,79,36,38
+71028,26,1265,1371,602,36,38
+71029,25,1266,1348,599,36,38
+71030,25,1266,1349,602,36,38
+71031,25,1266,1350,530,36,38
+71032,25,1266,1351,95,36,38
+71033,26,1266,1348,599,36,38
+71034,26,1266,1349,602,36,38
+71035,26,1266,1350,530,36,38
+71036,26,1266,1351,95,36,38
+71037,25,1267,1352,602,36,38
+71038,25,1267,1353,95,36,38
+71039,26,1267,1352,602,36,38
+71040,26,1267,1353,95,36,38
+71041,25,1267,1356,75,35,38
+71042,25,1267,1357,525,37,37
+71043,26,1267,1356,75,35,38
+71044,26,1267,1357,525,37,37
+71045,25,1268,1372,201,36,38
+71046,26,1268,1372,201,36,38
+71047,25,1269,1352,599,36,38
+71048,25,1269,1353,563,36,38
+71049,26,1269,1352,599,36,38
+71050,26,1269,1353,563,36,38
+71051,25,1269,1356,75,35,38
+71052,25,1269,1357,525,37,37
+71053,26,1269,1356,75,35,38
+71054,26,1269,1357,525,37,37
+71055,25,1270,1352,599,36,38
+71056,25,1270,1353,602,36,38
+71057,26,1270,1352,599,36,38
+71058,26,1270,1353,602,36,38
+71059,25,1270,1356,75,35,38
+71060,25,1270,1357,525,37,37
+71061,26,1270,1356,75,35,38
+71062,26,1270,1357,525,37,37
+71063,25,1271,1360,531,36,38
+71064,25,1271,1361,440,36,38
+71065,25,1271,1362,114,36,38
+71066,26,1271,1360,531,36,38
+71067,26,1271,1361,440,36,38
+71068,26,1271,1362,114,36,38
+71069,25,1272,1352,555,36,38
+71070,25,1272,1353,240,36,38
+71071,26,1272,1352,555,36,38
+71072,26,1272,1353,240,36,38
+71073,25,1273,1360,178,36,38
+71074,25,1273,1361,517,36,38
+71075,25,1273,1362,137,36,38
+71076,26,1273,1360,178,36,38
+71077,26,1273,1361,517,36,38
+71078,26,1273,1362,137,36,38
+71079,25,1273,1356,75,35,38
+71080,25,1273,1357,558,37,37
+71081,26,1273,1356,75,35,38
+71082,26,1273,1357,558,37,37
+71083,25,1274,1348,205,36,38
+71084,25,1274,1349,232,36,38
+71085,25,1274,1350,402,36,38
+71086,25,1274,1351,627,36,38
+71087,26,1274,1348,205,36,38
+71088,26,1274,1349,232,36,38
+71089,26,1274,1350,402,36,38
+71090,26,1274,1351,627,36,38
+71091,25,1275,1348,205,36,38
+71092,25,1275,1349,232,36,38
+71093,25,1275,1350,402,36,38
+71094,25,1275,1351,234,36,38
+71095,26,1275,1348,205,36,38
+71096,26,1275,1349,232,36,38
+71097,26,1275,1350,402,36,38
+71098,26,1275,1351,234,36,38
+71099,25,1276,1352,523,36,38
+71100,25,1276,1353,239,36,38
+71101,26,1276,1352,523,36,38
+71102,26,1276,1353,239,36,38
+71103,25,1277,1348,205,36,38
+71104,25,1277,1349,232,36,38
+71105,25,1277,1350,402,36,38
+71106,25,1277,1351,203,36,38
+71107,26,1277,1348,205,36,38
+71108,26,1277,1349,232,36,38
+71109,26,1277,1350,402,36,38
+71110,26,1277,1351,203,36,38
+71111,25,1278,1348,205,36,38
+71112,25,1278,1349,232,36,38
+71113,25,1278,1350,402,36,38
+71114,25,1278,1351,629,36,38
+71115,26,1278,1348,205,36,38
+71116,26,1278,1349,232,36,38
+71117,26,1278,1350,402,36,38
+71118,26,1278,1351,629,36,38
\ No newline at end of file
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 9c3ccd2a0..25c73b2e1 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2317,3 +2317,19 @@ location_area_id,local_language_id,name
 1260,9,The Under (Deep Colosseum)
 1261,9,Mt. Battle 100F
 1262,9,Phenac City (Card E Room)
+1263,9,Mirage Cave (South of Pacifidlog)
+1264,9,Mirage Cave (North of Route 132)
+1265,9,Mirage Cave (North of Fallarbor)
+1266,9,Mirage Cave (North of Fortree)
+1267,9,Mirage Cave (South East of Route 129)
+1268,9,Mirage Cave (South of Route 107)
+1269,9,Mirage Cave (North of Route 124)
+1270,9,Mirage Cave (West of Rustboro)
+1271,9,Mirage Mountain (East of Mossdeep)
+1272,9,Mirage Mountain (North of Mossdeep)
+1273,9,Mirage Mountain (South East of Route 129)
+1274,9,Mirage Mountain (North of Lilycove)
+1275,9,Mirage Mountain (West of Route 104)
+1276,9,Mirage Mountain (South of Route 129)
+1277,9,Mirage Mountain (South of Route 131)
+1278,9,Mirage Mountain (North East of Route 125)
\ No newline at end of file
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 5e195e4e0..57e7ac982 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1130,14 +1130,14 @@ id,location_id,game_index,identifier
 1239,1099,0,duel-square
 1240,1099,0,entrance
 1241,1100,0,1f
-1242,1101,0,mirors-hideout
+1242,1101,0,miror's-hideout
 1243,1100,0,4f
-1244,1101,0,outside
-1245,1101,0,south-sewers
+1244,1101,0,Outside
+1245,1101,0,south sewers
 1246,1101,0,bf1
 1247,1101,0,bf1-post-sewers
 1248,1102,0,
-1249,1096,0,colosseum
+1249,1099,0,miror's-hideout
 1250,1099,0,dukings-house
 1251,1098,0,bf1
 1252,1103,0,relic-forest
@@ -1151,3 +1151,19 @@ id,location_id,game_index,identifier
 1260,1104,0,deep-colosseum
 1261,1105,0,100f
 1262,1096,0,card-e-room
+1263,698,0,south-of-pacifidlog
+1264,698,0,north-of-route-132
+1265,698,0,north-of-fallarbor
+1266,698,0,north-of-fortree
+1267,698,0,south-east-of-route-129
+1268,698,0,south-of-route-107
+1269,698,0,north-of-route-124
+1270,698,0,west-of-rustburo
+1271,699,0,east-of-mossdeep
+1272,699,0,north-of-mossdeep
+1273,699,0,south-east-of-route-129
+1274,699,0,north-of-lilycove
+1275,699,0,west-of-route-104
+1276,699,0,south-of-route-129
+1277,699,0,south-of-route-131
+1278,699,0,north-east-of-route-125
\ No newline at end of file

From 3695e9635b5bfe3de9b99410956e3bea13e26018 Mon Sep 17 00:00:00 2001
From: ItsMejoji <itsmejojitcg@gmail.com>
Date: Mon, 23 Mar 2026 12:39:00 -0700
Subject: [PATCH 13/14] Reverting old to changes previous merge

---
 data/v2/csv/encounters.csv     | 8 ++++----
 data/v2/csv/location_areas.csv | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 1ebcf1686..3bc2fa2bf 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65398,7 +65398,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70957,19,1246,1364,307,33,33
 70958,19,1247,1364,333,33,33
 70959,19,1248,1366,185,35,35
-70960,19,1249,1364,185,35,35
+70960,19,1242,1364,185,35,35
 70961,19,1250,1365,311,13,13
 70962,19,1234,1366,237,38,38
 70963,19,1251,1366,237,38,38
@@ -65406,8 +65406,8 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70965,19,1248,1366,244,40,40
 70966,19,1260,1366,244,40,40
 70967,19,1254,1364,244,40,40
-70968,19,1234,1366,166,43,43
-70969,19,1255,1364,166,43,43
+70968,19,1234,1366,166,40,40
+70969,19,1255,1364,166,40,40
 70970,19,1248,1366,245,40,40
 70971,19,1260,1366,245,40,40
 70972,19,1256,1364,245,40,40
@@ -65443,7 +65443,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71002,19,1259,1364,376,50,50
 71003,19,1259,1364,248,55,55
 71004,19,1258,1364,235,45,45
-71005,19,1258,1364,218,45,45
+71005,19,1258,1364,217,45,45
 71006,19,1260,1364,213,45,45
 71007,19,1232,1364,176,20,20
 71008,19,1261,1365,250,70,70
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 57e7ac982..11456f0ec 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1130,14 +1130,14 @@ id,location_id,game_index,identifier
 1239,1099,0,duel-square
 1240,1099,0,entrance
 1241,1100,0,1f
-1242,1101,0,miror's-hideout
+1242,1101,0,mirors-hideout
 1243,1100,0,4f
-1244,1101,0,Outside
-1245,1101,0,south sewers
+1244,1101,0,outside
+1245,1101,0,south-sewers
 1246,1101,0,bf1
 1247,1101,0,bf1-post-sewers
 1248,1102,0,
-1249,1099,0,miror's-hideout
+1249,1099,0,colosseum
 1250,1099,0,dukings-house
 1251,1098,0,bf1
 1252,1103,0,relic-forest

From d613be4f9687f02318cf2335c2dd709fb6b22c9b Mon Sep 17 00:00:00 2001
From: ItsMeJoji <itsmejojitcg@gmail.com>
Date: Mon, 23 Mar 2026 12:40:44 -0700
Subject: [PATCH 14/14] Missed location_id change

---
 data/v2/csv/location_areas.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 11456f0ec..b2becbd66 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1137,7 +1137,7 @@ id,location_id,game_index,identifier
 1246,1101,0,bf1
 1247,1101,0,bf1-post-sewers
 1248,1102,0,
-1249,1099,0,colosseum
+1249,1096,0,colosseum
 1250,1099,0,dukings-house
 1251,1098,0,bf1
 1252,1103,0,relic-forest
@@ -1166,4 +1166,4 @@ id,location_id,game_index,identifier
 1275,699,0,west-of-route-104
 1276,699,0,south-of-route-129
 1277,699,0,south-of-route-131
-1278,699,0,north-east-of-route-125
\ No newline at end of file
+1278,699,0,north-east-of-route-125