From ba2fe3e181190bf3c601b5031ee3f99c84c02c84 Mon Sep 17 00:00:00 2001
From: Admiral-Fish <admiralfish420@gmail.com>
Date: Mon, 10 Apr 2023 09:12:28 -0700
Subject: [PATCH] Fix encounter table issues

---
 Source/Core/Gen4/Encounters4.cpp          | 27 +++++++++--------------
 Source/Core/Resources/EncounterTables     |  2 +-
 Source/Core/Resources/i18n/de/frlg_de.txt |  2 +-
 Source/Core/Resources/i18n/de/rs_de.txt   |  4 ++--
 Source/Core/Resources/i18n/en/frlg_en.txt |  2 +-
 Source/Core/Resources/i18n/en/rs_en.txt   |  4 ++--
 Source/Core/Resources/i18n/es/frlg_es.txt |  2 +-
 Source/Core/Resources/i18n/es/rs_es.txt   |  4 ++--
 Source/Core/Resources/i18n/fr/frlg_fr.txt |  2 +-
 Source/Core/Resources/i18n/fr/rs_fr.txt   |  4 ++--
 Source/Core/Resources/i18n/it/frlg_it.txt |  2 +-
 Source/Core/Resources/i18n/it/rs_it.txt   |  4 ++--
 Source/Core/Resources/i18n/ja/frlg_ja.txt |  2 +-
 Source/Core/Resources/i18n/ja/rs_ja.txt   |  4 ++--
 Source/Core/Resources/i18n/ko/frlg_ko.txt |  2 +-
 Source/Core/Resources/i18n/ko/rs_ko.txt   |  4 ++--
 Source/Core/Resources/i18n/zh/frlg_zh.txt |  2 +-
 Source/Core/Resources/i18n/zh/rs_zh.txt   |  4 ++--
 18 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/Source/Core/Gen4/Encounters4.cpp b/Source/Core/Gen4/Encounters4.cpp
index 264155a6b..677acbde0 100644
--- a/Source/Core/Gen4/Encounters4.cpp
+++ b/Source/Core/Gen4/Encounters4.cpp
@@ -128,9 +128,15 @@ struct WildEncounterHGSSHeadbutt
 {
     u8 location;
     bool hasSpecial;
-    DynamicSlot normal1[6];
-    DynamicSlot normal2[6];
-    DynamicSlot special[6];
+    union {
+        struct
+        {
+            DynamicSlot normal1[6];
+            DynamicSlot normal2[6];
+            DynamicSlot special[6];
+        };
+        DynamicSlot slots[18];
+    };
 };
 static_assert(sizeof(WildEncounterHGSSHeadbutt) == 74);
 
@@ -514,20 +520,7 @@ static std::vector<EncounterArea4> getHGSS(Game version, Encounter encounter, in
                 std::vector<Slot> slots;
                 slots.reserve(6);
 
-                const DynamicSlot *treeSlot;
-                if (tree == 0)
-                {
-                    treeSlot = entry->normal1;
-                }
-                else if (tree == 1)
-                {
-                    treeSlot = entry->normal2;
-                }
-                else
-                {
-                    treeSlot = entry->special;
-                }
-
+                const DynamicSlot *treeSlot = &entry->slots[6 * tree];
                 for (size_t i = 0; i < 6; i++)
                 {
                     const auto &slot = treeSlot[i];
diff --git a/Source/Core/Resources/EncounterTables b/Source/Core/Resources/EncounterTables
index 9cc9c3bcb..9bb897afe 160000
--- a/Source/Core/Resources/EncounterTables
+++ b/Source/Core/Resources/EncounterTables
@@ -1 +1 @@
-Subproject commit 9cc9c3bcb99a10720715b6f91ed51c45682e55a0
+Subproject commit 9bb897afe61d96c3c7bfd9bfdb56a103d5697ae9
diff --git a/Source/Core/Resources/i18n/de/frlg_de.txt b/Source/Core/Resources/i18n/de/frlg_de.txt
index 98b91d215..07b0299f7 100644
--- a/Source/Core/Resources/i18n/de/frlg_de.txt
+++ b/Source/Core/Resources/i18n/de/frlg_de.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/de/rs_de.txt b/Source/Core/Resources/i18n/de/rs_de.txt
index 4944ea12f..915edf1d3 100644
--- a/Source/Core/Resources/i18n/de/rs_de.txt
+++ b/Source/Core/Resources/i18n/de/rs_de.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Dewford Town
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/en/frlg_en.txt b/Source/Core/Resources/i18n/en/frlg_en.txt
index 98b91d215..07b0299f7 100644
--- a/Source/Core/Resources/i18n/en/frlg_en.txt
+++ b/Source/Core/Resources/i18n/en/frlg_en.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/en/rs_en.txt b/Source/Core/Resources/i18n/en/rs_en.txt
index 4944ea12f..915edf1d3 100644
--- a/Source/Core/Resources/i18n/en/rs_en.txt
+++ b/Source/Core/Resources/i18n/en/rs_en.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Dewford Town
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/es/frlg_es.txt b/Source/Core/Resources/i18n/es/frlg_es.txt
index b12c19e4d..48abb1bf5 100644
--- a/Source/Core/Resources/i18n/es/frlg_es.txt
+++ b/Source/Core/Resources/i18n/es/frlg_es.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Calle Victoria Planta baja
 14,Calle Victoria Segunda planta
diff --git a/Source/Core/Resources/i18n/es/rs_es.txt b/Source/Core/Resources/i18n/es/rs_es.txt
index 2ddc89be9..fc150061d 100644
--- a/Source/Core/Resources/i18n/es/rs_es.txt
+++ b/Source/Core/Resources/i18n/es/rs_es.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Pueblo Azuliza
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/fr/frlg_fr.txt b/Source/Core/Resources/i18n/fr/frlg_fr.txt
index 98b91d215..07b0299f7 100644
--- a/Source/Core/Resources/i18n/fr/frlg_fr.txt
+++ b/Source/Core/Resources/i18n/fr/frlg_fr.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/fr/rs_fr.txt b/Source/Core/Resources/i18n/fr/rs_fr.txt
index 4944ea12f..915edf1d3 100644
--- a/Source/Core/Resources/i18n/fr/rs_fr.txt
+++ b/Source/Core/Resources/i18n/fr/rs_fr.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Dewford Town
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/it/frlg_it.txt b/Source/Core/Resources/i18n/it/frlg_it.txt
index 66b834b43..2179e2fb1 100644
--- a/Source/Core/Resources/i18n/it/frlg_it.txt
+++ b/Source/Core/Resources/i18n/it/frlg_it.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/it/rs_it.txt b/Source/Core/Resources/i18n/it/rs_it.txt
index 67389c888..c0114d02a 100644
--- a/Source/Core/Resources/i18n/it/rs_it.txt
+++ b/Source/Core/Resources/i18n/it/rs_it.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Bluruvia
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/ja/frlg_ja.txt b/Source/Core/Resources/i18n/ja/frlg_ja.txt
index 98b91d215..c82d01ab3 100644
--- a/Source/Core/Resources/i18n/ja/frlg_ja.txt
+++ b/Source/Core/Resources/i18n/ja/frlg_ja.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S. Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/ja/rs_ja.txt b/Source/Core/Resources/i18n/ja/rs_ja.txt
index 4944ea12f..915edf1d3 100644
--- a/Source/Core/Resources/i18n/ja/rs_ja.txt
+++ b/Source/Core/Resources/i18n/ja/rs_ja.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Dewford Town
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/ko/frlg_ko.txt b/Source/Core/Resources/i18n/ko/frlg_ko.txt
index 98b91d215..07b0299f7 100644
--- a/Source/Core/Resources/i18n/ko/frlg_ko.txt
+++ b/Source/Core/Resources/i18n/ko/frlg_ko.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/ko/rs_ko.txt b/Source/Core/Resources/i18n/ko/rs_ko.txt
index 4944ea12f..915edf1d3 100644
--- a/Source/Core/Resources/i18n/ko/rs_ko.txt
+++ b/Source/Core/Resources/i18n/ko/rs_ko.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Dewford Town
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file
diff --git a/Source/Core/Resources/i18n/zh/frlg_zh.txt b/Source/Core/Resources/i18n/zh/frlg_zh.txt
index 98b91d215..07b0299f7 100644
--- a/Source/Core/Resources/i18n/zh/frlg_zh.txt
+++ b/Source/Core/Resources/i18n/zh/frlg_zh.txt
@@ -9,7 +9,7 @@
 8,Mt Moon 1F
 9,Mt Moon B1F
 10,Mt Moon B2F
-11,Ssanne Exterior
+11,S.S Anne Exterior
 12,Digletts Cave B1F
 13,Victory Road 1F
 14,Victory Road 2F
diff --git a/Source/Core/Resources/i18n/zh/rs_zh.txt b/Source/Core/Resources/i18n/zh/rs_zh.txt
index 4944ea12f..915edf1d3 100644
--- a/Source/Core/Resources/i18n/zh/rs_zh.txt
+++ b/Source/Core/Resources/i18n/zh/rs_zh.txt
@@ -93,5 +93,5 @@
 92,Safari Zone Southeast
 93,Dewford Town
 94,Pacifidlog Town
-95,Underwater1
-96,Underwater2
\ No newline at end of file
+95,Underwater Route 124
+96,Underwater Route 126
\ No newline at end of file