Merge pull request #446 from ThibaultLassiaz/support-level-grind-fire…

…-red Fire Red : Support Level Grind mode for IT, SP, FR, GR languages #438
40Cakes · Oct 17, 2024 · 011f96f · 011f96f
2 parents 83fe5d2 + 57fe8c5
commit 011f96f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/modules/battle_action_selection.py b/modules/battle_action_selection.py
@@ -231,7 +231,7 @@ def battle_action_use_move(
         yield from scroll_to_battle_action(0)
         yield
         context.emulator.press_button("A")
-    for _ in range(6 if context.rom.is_rse else 7):
+    for _ in range(6 if context.rom.is_rse else 8):
         yield
 
     # It's possible the game does not actually offer the move list at this point, for example

diff --git a/modules/data/symbols/patches/language/pokefirered.json b/modules/data/symbols/patches/language/pokefirered.json
@@ -469,6 +469,18 @@
     "I":"81a661f",
     "S":"81a8860"
   },
+  "BattleScript_AskToLearnMove":{
+    "D":"81dccb1",
+    "F":"81d71ed",
+    "I":"81d5e85",
+    "S":"81d854d"
+  },
+  "BattleScript_ForgotAndLearnedNewMove":{
+    "D":"81dccde",
+    "F":"81d721a",
+    "I":"81d5eb2",
+    "S":"81d857a"
+  },
   "Route19_Text_LucRematchIntro":{
     "D":"0"
   },

diff --git a/wiki/pages/Mode - Level Grind.md b/wiki/pages/Mode - Level Grind.md
@@ -70,10 +70,10 @@ The following routes are supported:
 |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:|
 | English  |    ✅    |      ✅      |     ✅      |     ✅      |      ✅       |
 | Japanese |    ❌    |      ❌      |     ✅      |     ❌      |      ❌       |
-| German   |    ❌    |      ❌      |     ✅      |     ❌      |      ❌       |
-| Spanish  |    ❌    |      ❌      |     ✅      |     ❌      |      ❌       |
-| French   |    ❌    |      ❌      |     ✅      |     ❌      |      ❌       |
-| Italian  |    ❌    |      ❌      |     ✅      |     ❌      |      ❌       |
+| German   |    ❌    |      ❌      |     ✅      |     ✅      |      ❌       |
+| Spanish  |    ❌    |      ❌      |     ✅      |     ✅      |      ❌       |
+| French   |    ❌    |      ❌      |     ✅      |     ✅      |      ❌       |
+| Italian  |    ❌    |      ❌      |     ✅      |     ✅      |      ❌       |
 
 ✅ Tested, working