From 53fa7e524c0130c60440ac2a100a154f372df962 Mon Sep 17 00:00:00 2001
From: AgustinGDLV <agustingomezdelavega@gmail.com>
Date: Sat, 3 Jun 2023 11:32:54 -0700
Subject: [PATCH 01/10] allow for illegal abilities within tests

---
 include/config.h          |  2 +-
 include/test_runner.h     |  4 ++++
 src/battle_main.c         | 20 ++++++++++++++++++++
 test/test_battle.h        |  1 +
 test/test_runner_battle.c | 14 +++++++++++++-
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/include/config.h b/include/config.h
index 2ad84f29c..9412c8f42 100644
--- a/include/config.h
+++ b/include/config.h
@@ -6,7 +6,7 @@
 // still has them in the ROM. This is because the developers forgot
 // to define NDEBUG before release, however this has been changed as
 // Ruby's actual debug build does not use the AGBPrint features.
-#define NDEBUG
+// #define NDEBUG
 
 // To enable printf debugging, comment out "#define NDEBUG". This allows
 // the various AGBPrint functions to be used. (See include/gba/isagbprint.h).
diff --git a/include/test_runner.h b/include/test_runner.h
index 27b0d5977..91f6f8f43 100644
--- a/include/test_runner.h
+++ b/include/test_runner.h
@@ -17,6 +17,8 @@ void TestRunner_Battle_AfterLastTurn(void);
 
 void TestRunner_Battle_CheckBattleRecordActionType(u32 battlerId, u32 recordIndex, u32 actionType);
 
+u32 TestRunner_Battle_GetForcedAbility(u32 side, u32 partyIndex);
+
 #else
 
 #define TestRunner_Battle_RecordAbilityPopUp(...) (void)0
@@ -28,6 +30,8 @@ void TestRunner_Battle_CheckBattleRecordActionType(u32 battlerId, u32 recordInde
 
 #define TestRunner_Battle_CheckBattleRecordActionType(...) (void)0
 
+#define TestRunner_Battle_GetForcedAbility(...) (u32)0
+
 #endif
 
 #endif
diff --git a/src/battle_main.c b/src/battle_main.c
index 270447a0e..979583453 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3302,6 +3302,14 @@ void SwitchInClearSetData(void)
     // Clear selected party ID so Revival Blessing doesn't get confused.
     gSelectedMonPartyId = PARTY_SIZE;
 
+    // Allow for illegal abilities within tests.
+    if (gTestRunnerEnabled)
+    {
+        u32 side = GetBattlerSide(gActiveBattler);
+        u32 partyIndex = gBattlerPartyIndexes[gActiveBattler];
+        gBattleMons[gActiveBattler].ability = gBattleStruct->overwrittenAbilities[gActiveBattler] = TestRunner_Battle_GetForcedAbility(side, partyIndex);
+    }
+
     Ai_UpdateSwitchInData(gActiveBattler);
 }
 
@@ -3794,6 +3802,18 @@ static void TryDoEventsBeforeFirstTurn(void)
         }
     }
 
+    // Allow for illegal abilities within tests.
+    if (gTestRunnerEnabled && gBattleStruct->switchInAbilitiesCounter == 0)
+    {
+        for (i = 0; i < gBattlersCount; ++i)
+        {
+            u32 side = GetBattlerSide(i);
+            u32 partyIndex = gBattlerPartyIndexes[i];
+            if (TestRunner_Battle_GetForcedAbility(side, partyIndex))
+                gBattleMons[i].ability = gBattleStruct->overwrittenAbilities[i] = TestRunner_Battle_GetForcedAbility(side, partyIndex);
+        }
+    }
+
     if (gBattleStruct->switchInAbilitiesCounter == 0)
     {
         for (i = 0; i < gBattlersCount; i++)
diff --git a/test/test_battle.h b/test/test_battle.h
index 205c69919..bd8061f42 100644
--- a/test/test_battle.h
+++ b/test/test_battle.h
@@ -574,6 +574,7 @@ struct BattleTestData
     struct Pokemon *currentMon;
     u8 gender;
     u8 nature;
+    u16 forcedAbilities[NUM_BATTLE_SIDES][PARTY_SIZE];
 
     u8 currentMonIndexes[MAX_BATTLERS_COUNT];
     u8 turnState;
diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c
index d1feaee02..835853624 100644
--- a/test/test_runner_battle.c
+++ b/test/test_runner_battle.c
@@ -1090,7 +1090,14 @@ void Ability_(u32 sourceLine, u32 ability)
             break;
         }
     }
-    INVALID_IF(i == NUM_ABILITY_SLOTS, "%S cannot have %S", gSpeciesNames[species], gAbilityNames[ability]);
+
+    // Store forced ability to be set when the battle starts if invalid.
+    if (i == NUM_ABILITY_SLOTS)
+    {
+        DATA.forcedAbilities[DATA.currentSide][DATA.currentPartyIndex] = ability;
+    }
+        
+    // INVALID_IF(i == NUM_ABILITY_SLOTS, "%S cannot have %S", gSpeciesNames[species], gAbilityNames[ability]);
 }
 
 void Level_(u32 sourceLine, u32 level)
@@ -1774,3 +1781,8 @@ void ValidateFinally(u32 sourceLine)
         return;
     INVALID_IF(STATE->parametersCount == 0, "FINALLY without PARAMETRIZE");
 }
+
+u32 TestRunner_Battle_GetForcedAbility(u32 side, u32 partyIndex)
+{
+    return DATA.forcedAbilities[side][partyIndex];
+}

From d7130fbb0fe3b0a28dd36860d772db5f2fc68fad Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 14:50:14 -0400
Subject: [PATCH 02/10] Create battle_engine_bugs.yaml

---
 .../ISSUE_TEMPLATE/battle_engine_bugs.yaml    | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/battle_engine_bugs.yaml

diff --git a/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
new file mode 100644
index 000000000..eb57f053c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
@@ -0,0 +1,54 @@
+name: 🐛 Report a Battle Engine Bug
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.5.0 (Default)
+        - upcoming (Edge)
+        - 1.4.3
+        - 1.4.2
+        - 1.4.1
+        - 1.4.0
+        - 1.3.0
+        - 1.2.0
+        - 1.1.0
+        - 1.0.0
+        - pre-1.0.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming Version
+      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false

From d795256142cdb9e4713823231c4a8eb8f68ce28f Mon Sep 17 00:00:00 2001
From: AgustinGDLV <agustingomezdelavega@gmail.com>
Date: Sat, 3 Jun 2023 11:56:01 -0700
Subject: [PATCH 03/10] remove debug

---
 include/config.h          | 2 +-
 test/test_runner_battle.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/config.h b/include/config.h
index 9412c8f42..2ad84f29c 100644
--- a/include/config.h
+++ b/include/config.h
@@ -6,7 +6,7 @@
 // still has them in the ROM. This is because the developers forgot
 // to define NDEBUG before release, however this has been changed as
 // Ruby's actual debug build does not use the AGBPrint features.
-// #define NDEBUG
+#define NDEBUG
 
 // To enable printf debugging, comment out "#define NDEBUG". This allows
 // the various AGBPrint functions to be used. (See include/gba/isagbprint.h).
diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c
index 835853624..a30c1e960 100644
--- a/test/test_runner_battle.c
+++ b/test/test_runner_battle.c
@@ -1090,14 +1090,11 @@ void Ability_(u32 sourceLine, u32 ability)
             break;
         }
     }
-
     // Store forced ability to be set when the battle starts if invalid.
     if (i == NUM_ABILITY_SLOTS)
     {
         DATA.forcedAbilities[DATA.currentSide][DATA.currentPartyIndex] = ability;
     }
-        
-    // INVALID_IF(i == NUM_ABILITY_SLOTS, "%S cannot have %S", gSpeciesNames[species], gAbilityNames[ability]);
 }
 
 void Level_(u32 sourceLine, u32 level)

From 1ea23daefe69ab5b62f4903b92b96e7b06f2c113 Mon Sep 17 00:00:00 2001
From: AgustinGDLV <agustingomezdelavega@gmail.com>
Date: Sat, 3 Jun 2023 11:58:57 -0700
Subject: [PATCH 04/10] fixed bug with zeroing out abilities on switch-in

---
 src/battle_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index 979583453..f082fb210 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3307,7 +3307,8 @@ void SwitchInClearSetData(void)
     {
         u32 side = GetBattlerSide(gActiveBattler);
         u32 partyIndex = gBattlerPartyIndexes[gActiveBattler];
-        gBattleMons[gActiveBattler].ability = gBattleStruct->overwrittenAbilities[gActiveBattler] = TestRunner_Battle_GetForcedAbility(side, partyIndex);
+        if (TestRunner_Battle_GetForcedAbility(side, partyIndex))
+            gBattleMons[i].ability = gBattleStruct->overwrittenAbilities[i] = TestRunner_Battle_GetForcedAbility(side, partyIndex);
     }
 
     Ai_UpdateSwitchInData(gActiveBattler);

From f8408a42b31ee6e73db3d08f7d3e354032dfee23 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 15:07:43 -0400
Subject: [PATCH 05/10] Update battle_engine_bugs.yaml

---
 .github/ISSUE_TEMPLATE/battle_engine_bugs.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
index eb57f053c..dc25820b7 100644
--- a/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
@@ -1,5 +1,5 @@
-name: 🐛 Report a Battle Engine Bug
-description: File a bug report
+name: 🐛 Battle Engine mechanic bugs
+description: File a bug report related to battle mechanic, be it moves, abilities and/or items.
 title: "[Bug]: "
 labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
 body:

From 91c6c3ea95fc20c1c7dae2d0b716eb46f6a56dfc Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 15:11:47 -0400
Subject: [PATCH 06/10] Create battle_ai_issues.yaml

---
 .github/ISSUE_TEMPLATE/battle_ai_issues.yaml | 54 ++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/battle_ai_issues.yaml

diff --git a/.github/ISSUE_TEMPLATE/battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/battle_ai_issues.yaml
new file mode 100644
index 000000000..835e87945
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/battle_ai_issues.yaml
@@ -0,0 +1,54 @@
+name: 🐛 Battle AI bugs
+description: File a bug report related to battle AI.
+title: "[Bug]: "
+labels: ["bug", "status: unconfirmed", "category: battle-ai"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.5.0 (Default)
+        - upcoming (Edge)
+        - 1.4.3
+        - 1.4.2
+        - 1.4.1
+        - 1.4.0
+        - 1.3.0
+        - 1.2.0
+        - 1.1.0
+        - 1.0.0
+        - pre-1.0.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming Version
+      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false

From b389c34c889c2876987f92f719f5fe3b62856086 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 16:36:20 -0400
Subject: [PATCH 07/10] Further templates

---
 ...e_bugs.yaml => 01_battle_engine_bugs.yaml} | 12 ++---
 ...i_issues.yaml => 02_battle_ai_issues.yaml} | 12 ++---
 .../ISSUE_TEMPLATE/03_feature_requests.yaml   | 28 +++++++++++
 .github/ISSUE_TEMPLATE/04_other_errors.yaml   | 50 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml             |  5 ++
 5 files changed, 91 insertions(+), 16 deletions(-)
 rename .github/ISSUE_TEMPLATE/{battle_engine_bugs.yaml => 01_battle_engine_bugs.yaml} (91%)
 rename .github/ISSUE_TEMPLATE/{battle_ai_issues.yaml => 02_battle_ai_issues.yaml} (92%)
 create mode 100644 .github/ISSUE_TEMPLATE/03_feature_requests.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/04_other_errors.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
similarity index 91%
rename from .github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
rename to .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
index dc25820b7..688a8d471 100644
--- a/.github/ISSUE_TEMPLATE/battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -1,6 +1,6 @@
-name: 🐛 Battle Engine mechanic bugs
+name: ⚔️ Battle Engine mechanical bugs 🐛
 description: File a bug report related to battle mechanic, be it moves, abilities and/or items.
-title: "[Bug]: "
+title: ""
 labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
 body:
   - type: markdown
@@ -24,17 +24,13 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.5.0 (Default)
         - upcoming (Edge)
+        - 1.5.0 (Default)
         - 1.4.3
         - 1.4.2
         - 1.4.1
         - 1.4.0
-        - 1.3.0
-        - 1.2.0
-        - 1.1.0
-        - 1.0.0
-        - pre-1.0.0
+        - pre-1.4.0
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
similarity index 92%
rename from .github/ISSUE_TEMPLATE/battle_ai_issues.yaml
rename to .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
index 835e87945..e0c41032e 100644
--- a/.github/ISSUE_TEMPLATE/battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -1,6 +1,6 @@
-name: 🐛 Battle AI bugs
+name: 🧠 Battle AI bugs 🐛
 description: File a bug report related to battle AI.
-title: "[Bug]: "
+title: ""
 labels: ["bug", "status: unconfirmed", "category: battle-ai"]
 body:
   - type: markdown
@@ -24,17 +24,13 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.5.0 (Default)
         - upcoming (Edge)
+        - 1.5.0 (Default)
         - 1.4.3
         - 1.4.2
         - 1.4.1
         - 1.4.0
-        - 1.3.0
-        - 1.2.0
-        - 1.1.0
-        - 1.0.0
-        - pre-1.0.0
+        - pre-1.4.0
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
new file mode 100644
index 000000000..03ac19818
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
@@ -0,0 +1,28 @@
+name: 🙏 Feature Request 🙏
+description: Do you want a feature to be added to the Expansion? Let us know!
+title: ""
+labels: ["feature-request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
new file mode 100644
index 000000000..33e6f1723
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -0,0 +1,50 @@
+name: 💾 Other errors 🖥️
+description: Everything else that doesn't fit in the above categories.
+title: ""
+labels: ["bug", "status: unconfirmed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - upcoming (Edge)
+        - 1.5.0 (Default)
+        - 1.4.3
+        - 1.4.2
+        - 1.4.1
+        - 1.4.0
+        - pre-1.4.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming Version
+      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..9dc46b6e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links: 
+  - name: Rom-Hacking Hideout's Discord server!
+    url: https://discord.gg/6CzjAG6GZk
+    about: You can follow the development of pokeemerald-expansion and be notified of new releases :)
\ No newline at end of file

From c17d6f4bc7a8ebdf4ecce3108d32dbbde49273a0 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 16:39:56 -0400
Subject: [PATCH 08/10] Update 01_battle_engine_bugs.yaml

---
 .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
index 688a8d471..72dc8eaf6 100644
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -1,6 +1,5 @@
 name: ⚔️ Battle Engine mechanical bugs 🐛
 description: File a bug report related to battle mechanic, be it moves, abilities and/or items.
-title: ""
 labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
 body:
   - type: markdown

From ee2f9da72a959cf92a855a8038e87442628cd728 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 16:40:51 -0400
Subject: [PATCH 09/10] Fixed issue template titles

---
 .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml | 1 -
 .github/ISSUE_TEMPLATE/03_feature_requests.yaml | 1 -
 .github/ISSUE_TEMPLATE/04_other_errors.yaml     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
index e0c41032e..df5fbceab 100644
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -1,6 +1,5 @@
 name: 🧠 Battle AI bugs 🐛
 description: File a bug report related to battle AI.
-title: ""
 labels: ["bug", "status: unconfirmed", "category: battle-ai"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
index 03ac19818..79e85709f 100644
--- a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
+++ b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
@@ -1,6 +1,5 @@
 name: 🙏 Feature Request 🙏
 description: Do you want a feature to be added to the Expansion? Let us know!
-title: ""
 labels: ["feature-request"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
index 33e6f1723..261551eda 100644
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -1,6 +1,5 @@
 name: 💾 Other errors 🖥️
 description: Everything else that doesn't fit in the above categories.
-title: ""
 labels: ["bug", "status: unconfirmed"]
 body:
   - type: markdown

From e43567f0a11fa9bfdc6e3539c62849626d66267b Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sat, 3 Jun 2023 16:49:49 -0400
Subject: [PATCH 10/10] Fixed releases order

---
 .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml | 2 +-
 .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml   | 2 +-
 .github/ISSUE_TEMPLATE/04_other_errors.yaml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
index 72dc8eaf6..7a04bf329 100644
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -23,8 +23,8 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - upcoming (Edge)
         - 1.5.0 (Default)
+        - upcoming (Edge)
         - 1.4.3
         - 1.4.2
         - 1.4.1
diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
index df5fbceab..ef03b5547 100644
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -23,8 +23,8 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - upcoming (Edge)
         - 1.5.0 (Default)
+        - upcoming (Edge)
         - 1.4.3
         - 1.4.2
         - 1.4.1
diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
index 261551eda..a1ff7e0c4 100644
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -23,8 +23,8 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - upcoming (Edge)
         - 1.5.0 (Default)
+        - upcoming (Edge)
         - 1.4.3
         - 1.4.2
         - 1.4.1