From ad6b95b25e7869d1215e1fddf2835f517d0eee98 Mon Sep 17 00:00:00 2001 From: Neka Date: Sat, 28 Dec 2024 17:17:53 +0100 Subject: [PATCH 01/15] Test and add support for Sapphire EN & GR modes --- wiki/pages/Mode - Level Grind.md | 6 +++--- wiki/pages/Mode - Puzzle Solver.md | 10 +++++----- wiki/pages/Mode - Roamer Resets.md | 6 +++--- wiki/pages/Mode - Rock Smash.md | 6 +++--- wiki/pages/Mode - Spin.md | 6 +++--- wiki/pages/Mode - Starters.md | 6 +++--- wiki/pages/Mode - Static Gift Resets.md | 6 +++--- wiki/pages/Mode - Static Soft Resets.md | 6 +++--- wiki/pages/Mode - Sweet Scent.md | 6 +++--- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/wiki/pages/Mode - Level Grind.md b/wiki/pages/Mode - Level Grind.md index 56f4ad78..6d6c3c50 100644 --- a/wiki/pages/Mode - Level Grind.md +++ b/wiki/pages/Mode - Level Grind.md @@ -54,9 +54,9 @@ Try another route that has an easy overland path to a Pokémon Center. | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Puzzle Solver.md b/wiki/pages/Mode - Puzzle Solver.md index 80208915..8463cd58 100644 --- a/wiki/pages/Mode - Puzzle Solver.md +++ b/wiki/pages/Mode - Puzzle Solver.md @@ -146,23 +146,23 @@ Start bot mode anywhere inside the glass workshop. | **Mirage Tower** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Sky Pillar** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | | **Deoxys** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🔥 Fire Red | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🌿 LeafGreen | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Regice** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Regirock** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Registeel** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Tanoby Key** | 🔥 Fire Red | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🌿 LeafGreen | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **White Flute** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Roamer Resets.md b/wiki/pages/Mode - Roamer Resets.md index fb57fc6b..36ac6e89 100644 --- a/wiki/pages/Mode - Roamer Resets.md +++ b/wiki/pages/Mode - Roamer Resets.md @@ -59,9 +59,9 @@ Unlike Emerald version, Ruby and Sapphire are not restricted by the sequence tha | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Rock Smash.md b/wiki/pages/Mode - Rock Smash.md index bdcfd50b..6f2e9ead 100644 --- a/wiki/pages/Mode - Rock Smash.md +++ b/wiki/pages/Mode - Rock Smash.md @@ -70,9 +70,9 @@ The mode will continuously try to enter the Safari Zone, so make sure you have s | English | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | | German | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | +| French | ✅ | ❌ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Spin.md b/wiki/pages/Mode - Spin.md index fd7fd35b..d68ad365 100644 --- a/wiki/pages/Mode - Spin.md +++ b/wiki/pages/Mode - Spin.md @@ -32,9 +32,9 @@ if your Safari Ball count drops below `15`. | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Starters.md b/wiki/pages/Mode - Starters.md index 0c127191..56ff78b1 100644 --- a/wiki/pages/Mode - Starters.md +++ b/wiki/pages/Mode - Starters.md @@ -44,9 +44,9 @@ Soft resets for starter Pokémon. | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Static Gift Resets.md b/wiki/pages/Mode - Static Gift Resets.md index c7b83668..f8a09e00 100644 --- a/wiki/pages/Mode - Static Gift Resets.md +++ b/wiki/pages/Mode - Static Gift Resets.md @@ -140,9 +140,9 @@ Soft reset for a static gift Pokémon that are directly added to your party with | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Static Soft Resets.md b/wiki/pages/Mode - Static Soft Resets.md index 98b9b2e4..4e7deca5 100644 --- a/wiki/pages/Mode - Static Soft Resets.md +++ b/wiki/pages/Mode - Static Soft Resets.md @@ -57,9 +57,9 @@ Static soft reset mode targets static Pokémon by simply spamming the A button u | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Sweet Scent.md b/wiki/pages/Mode - Sweet Scent.md index 6b47ed8c..a4d49b3f 100644 --- a/wiki/pages/Mode - Sweet Scent.md +++ b/wiki/pages/Mode - Sweet Scent.md @@ -15,9 +15,9 @@ Start the mode while in the overworld, in any patch of grass/water/cave with enc | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | -| French | ✅ | ✅ | ✅ | ✅ | ✅ | -| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | +| French | ✅ | ❌ | ✅ | ✅ | ✅ | +| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ Tested, working From 0c6a184a12b06db47101bffad471f5f2069d01e6 Mon Sep 17 00:00:00 2001 From: Neka Date: Sat, 28 Dec 2024 20:32:28 +0100 Subject: [PATCH 02/15] Support battling modes for Sapphire EU --- wiki/pages/Mode - Level Grind.md | 6 +++--- wiki/pages/Mode - Spin.md | 6 +++--- wiki/pages/Mode - Sweet Scent.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wiki/pages/Mode - Level Grind.md b/wiki/pages/Mode - Level Grind.md index 6d6c3c50..56f4ad78 100644 --- a/wiki/pages/Mode - Level Grind.md +++ b/wiki/pages/Mode - Level Grind.md @@ -54,9 +54,9 @@ Try another route that has an easy overland path to a Pokémon Center. | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Spin.md b/wiki/pages/Mode - Spin.md index d68ad365..fd7fd35b 100644 --- a/wiki/pages/Mode - Spin.md +++ b/wiki/pages/Mode - Spin.md @@ -32,9 +32,9 @@ if your Safari Ball count drops below `15`. | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Sweet Scent.md b/wiki/pages/Mode - Sweet Scent.md index a4d49b3f..6b47ed8c 100644 --- a/wiki/pages/Mode - Sweet Scent.md +++ b/wiki/pages/Mode - Sweet Scent.md @@ -15,9 +15,9 @@ Start the mode while in the overworld, in any patch of grass/water/cave with enc | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working From 87b91c3fd940f458f0d47351d6d7ad494fe50070 Mon Sep 17 00:00:00 2001 From: Neka Date: Sun, 29 Dec 2024 16:22:34 +0100 Subject: [PATCH 03/15] Support Puzzle Solver for Sapphire EU --- wiki/pages/Mode - Puzzle Solver.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wiki/pages/Mode - Puzzle Solver.md b/wiki/pages/Mode - Puzzle Solver.md index 8463cd58..80208915 100644 --- a/wiki/pages/Mode - Puzzle Solver.md +++ b/wiki/pages/Mode - Puzzle Solver.md @@ -146,23 +146,23 @@ Start bot mode anywhere inside the glass workshop. | **Mirage Tower** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Sky Pillar** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | | **Deoxys** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🔥 Fire Red | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🌿 LeafGreen | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Regice** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Regirock** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Registeel** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Tanoby Key** | 🔥 Fire Red | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🌿 LeafGreen | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **White Flute** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working From 9ba142f18c0895a381f01fe6e314d05b031a1de6 Mon Sep 17 00:00:00 2001 From: Neka Date: Sun, 29 Dec 2024 16:38:49 +0100 Subject: [PATCH 04/15] Support Roamer resets for Sapphire EU --- wiki/pages/Mode - Roamer Resets.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/pages/Mode - Roamer Resets.md b/wiki/pages/Mode - Roamer Resets.md index 36ac6e89..fb57fc6b 100644 --- a/wiki/pages/Mode - Roamer Resets.md +++ b/wiki/pages/Mode - Roamer Resets.md @@ -59,9 +59,9 @@ Unlike Emerald version, Ruby and Sapphire are not restricted by the sequence tha | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working From 9e55342960cee4e7063d306fd8c6d232b97224d2 Mon Sep 17 00:00:00 2001 From: Neka Date: Sun, 29 Dec 2024 16:42:36 +0100 Subject: [PATCH 05/15] Support Rock Smash for Sapphire EU --- wiki/pages/Mode - Rock Smash.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/pages/Mode - Rock Smash.md b/wiki/pages/Mode - Rock Smash.md index 6f2e9ead..bdcfd50b 100644 --- a/wiki/pages/Mode - Rock Smash.md +++ b/wiki/pages/Mode - Rock Smash.md @@ -70,9 +70,9 @@ The mode will continuously try to enter the Safari Zone, so make sure you have s | English | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | | German | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | -| French | ✅ | ❌ | ✅ | -| Italian | ✅ | ❌ | ✅ | +| Spanish | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ Tested, working From 8f1b6baef5b9433e6a8a422ef838e01fa18ec2a9 Mon Sep 17 00:00:00 2001 From: Neka Date: Sun, 29 Dec 2024 16:46:43 +0100 Subject: [PATCH 06/15] Support Starters mode for Sapphire EU --- wiki/pages/Mode - Starters.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/pages/Mode - Starters.md b/wiki/pages/Mode - Starters.md index 56ff78b1..0c127191 100644 --- a/wiki/pages/Mode - Starters.md +++ b/wiki/pages/Mode - Starters.md @@ -44,9 +44,9 @@ Soft resets for starter Pokémon. | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working From 69c1a0ba1854a37e63d444db7f06b27e0ff2a480 Mon Sep 17 00:00:00 2001 From: Neka Date: Sun, 29 Dec 2024 17:04:15 +0100 Subject: [PATCH 07/15] Support SGR, SRR for Sapphire EU --- wiki/pages/Mode - Static Gift Resets.md | 6 +++--- wiki/pages/Mode - Static Soft Resets.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wiki/pages/Mode - Static Gift Resets.md b/wiki/pages/Mode - Static Gift Resets.md index f8a09e00..c7b83668 100644 --- a/wiki/pages/Mode - Static Gift Resets.md +++ b/wiki/pages/Mode - Static Gift Resets.md @@ -140,9 +140,9 @@ Soft reset for a static gift Pokémon that are directly added to your party with | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Static Soft Resets.md b/wiki/pages/Mode - Static Soft Resets.md index 4e7deca5..98b9b2e4 100644 --- a/wiki/pages/Mode - Static Soft Resets.md +++ b/wiki/pages/Mode - Static Soft Resets.md @@ -57,9 +57,9 @@ Static soft reset mode targets static Pokémon by simply spamming the A button u | English | ✅ | ✅ | ✅ | ✅ | ✅ | | Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | -| Spanish | ✅ | ❌ | ✅ | ✅ | ✅ | -| French | ✅ | ❌ | ✅ | ✅ | ✅ | -| Italian | ✅ | ❌ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working From dd1ad3f6631aad79043e20bbfce3207f5e2ca31b Mon Sep 17 00:00:00 2001 From: Neka Date: Mon, 30 Dec 2024 00:54:00 +0100 Subject: [PATCH 08/15] Fix map for Sapphire JP --- .../symbols/patches/language/pokesapphire.yml | 340 ++++++++++++++++++ 1 file changed, 340 insertions(+) create mode 100644 modules/data/symbols/patches/language/pokesapphire.yml diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml new file mode 100644 index 00000000..20c15cad --- /dev/null +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -0,0 +1,340 @@ +--- +#--------------------------------# +# Overworld / Util Symbols # +#--------------------------------# +CB2_OVERWORLD: + J: 0x8051614 +# Door exit +sub_8080B9C: + J: ~ +Task_HandleYesNoInput: + J: ~ +Task_FieldMessageBox: + J: ~ +# 0x7 +Std_MsgboxDefault: + J: ~ +# 0x9 +Std_MsgboxYesNo: + J: ~ +WaitForAorBPress: + J: ~ +Task_DuckBGMForPokemonCry: + J: ~ +CB2_FlyRegionMap: + J: ~ +gMain: + J: 0x30016e0 +gFieldMessageBoxWindow: + J: 0x202e5d4 +sScriptContext1: + J: 0x3000520 +sScriptContext2: + J: 0x30005a0 +#-------------------------------# + +#--------------------# +# Map Symbols # +#--------------------# +gMapGroups: + J: 0x82e0980 +gRegionMapEntries: + J: 0x83bef50 +gWildMonHeaders: + J: 0x83792fc +sTileBitAttributes: + J: 0x82e1224 +gObjectEvents: + J: 0x30047d0 +gPlayerPartyCount: + J: 0x3004280 +gPlayerParty: + J: 0x3004290 +gMapHeader: + J: 0x202e588 +gPlayerAvatar: + J: 0x202e5b8 +gRegionMap: + J: 0x20385C4 +gSaveBlock1: + J: 0x2025494 +gSaveBlock2: + J: 0x2024c04 +#----------------# + +#-----------------# +# Main Menu # +#-----------------# +CB2_InitCopyrightScreenAfterBootup: + J: ~ +MainCB2_Intro: + J: ~ +CB2_InitTitleScreen: + J: ~ +MainCB2: + J: ~ +CB2_MainMenu: + J: ~ +CB2_ReturnToFieldLocal: + J: ~ +#-----------------# + +#---------------------------# +# SSR/SRA/SGR/Roamers # +#---------------------------# +gRngValue: + J: 0x3004748 +# Fly +Task_MapNamePopup: + J: ~ +CB2_LoadMap: + J: ~ +Task_BattleStart: + J: ~ +SummaryScreenHandleKeyInput: + J: ~ +#--------------------# +# Battling Symbols # +#--------------------# +BattleMainCB1: + J: ~ +BattleMainCB2: + J: ~ +gBattleMainFunc: + J: 0x3004204 +gBattleResults: + J: 0x3004210 +gBattlerControllerFuncs: + J: 0x3004260 +gBattlescriptCurrInstr: + J: 0x2024970 +GTASKS: + J: 0x3004a50 +gEnemyParty: + J: 0x30044f0 +gBattleTypeFlags: + J: 0x2023758 +gBattlersCount: + J: 0x20247c8 +gSideTimers: + J: 0x20249e0 +gStatuses3: + J: 0x20249f8 +gBattlerPartyIndexes: + J: 0x20247ca +gBattleMons: + J: 0x20247e0 +gDisableStructs: + J: 0x2024a08 +gAbsentBattlerFlags: + J: 0x202496c +gBattleWeather: + J: 0x2024b18 +gBattleOutcome: + J: 0x2024a86 +gBattlePartyCurrentOrder: + J: 0x203818c +# Turn selection +sub_8012324: + J: ~ +sub_802C098: + J: ~ +HandleAction_ChooseMove: + J: ~ +# Turn selection Safari +bx_battle_menu_t6_2: + J: ~ +HandleEndTurn_FinishBattle: + J: ~ +BattleScript_HandleFaintedMon: + J: ~ +BattleScript_FaintedMonEnd: + J: ~ +CB2_WhiteOut: + J: ~ +gActionSelectionCursor: + J: 0x2024bc0 +gMoveSelectionCursor: + J: 0x2024bc4 +# Replace move +BattleScript_AskToLearnMove: + J: ~ +BattleScript_ForgotAndLearnedNewMove: + J: ~ +sub_809E260: + J: ~ +CB2_EvolutionSceneUpdate: + J: ~ +Task_EvolutionScene: + J: ~ +RunBattleScriptCommands_PopCallbacksStack: + J: ~ +#--------------------# + +#----------------# +# Daycare Mode # +#----------------# +S_EggHatch: + J: ~ +# EggHatch party identification +gSpecialVar_0x8004: + J: 0x202e620 +Task_Fanfare: + J: ~ +#----------------# + +#-------------------------# +# PC Menu / Storage # +#-------------------------# +Task_PokemonStorageSystem: + J: ~ +Task_HandleMultichoiceInput: + J: ~ +SUB_8096B38: + J: ~ +#-------------------------# + +#--------------# +# Bag Menu # +#--------------# +sub_80A3118: + J: ~ +sCurrentBagPocket: + J: 0x2038258 +gBagPocketScrollStates: + J: 0x3005c30 +sub_80A5414: + J: ~ +gPaletteFade: + J: 0x202f0a8 +sub_80A50C8: + J: ~ +#---------------# + +#-----------------# +# In game Menu # +#-----------------# +# Start Menu +sub_80712B4: + J: ~ +sStartMenuCursorPos: + J: 0x202e64c +sNumStartMenuActions: + J: 0x202e64d +sCurrentStartMenuActions: + J: 0x202e64e +#-----------------# + +#----------------# +# Party Menu # +#----------------# +HandleDefaultPartyMenu: + J: ~ +CB2_PartyMenuMain: + J: ~ +# Pokemon action menu +sub_8089D94: + J: ~ +HandleBattlePartyMenu: + J: ~ +Task_HandlePopupMenuInput: + J: ~ +# Pokemon switch +sub_806D198: + J: ~ +HandlePartyMenuSwitchPokemonInput: + J: ~ +sPokeMenuCursorPos: + J: 0x202fcc4 +sPokeMenuOptionsNo: + J: 0x202fcc5 +sPokeMenuOptionsOrder: + J: 0x202fcc6 +#----------------# + +#-------------------# +# Fishing Mode # +#-------------------# +Task_Fishing: + J: ~ +#-------------------# + +#---------------------# +# Pokemon renaming # +#---------------------# +# 0xa +BattleScript_TryNicknameCaughtMon: + J: ~ +sub_80B5AA0: + J: ~ +Task_HandleInput: + J: ~ +# 0x7 +BattleScript_GiveCaughtMonEnd: + J: ~ +# 0x6 +BattleScript_GotAwaySafely: + J: ~ +namingScreenDataPtr: + J: ~ + +#---------------------# + +#---------------------# +# Berry blending # +#---------------------# +SUB_80501FC: + J: ~ +gUnknown_08216303: + J: ~ +gBerryBlenderData: + J: 0x3004784 +#---------------------# + +#-----------# +# Feebas # +#-----------# +# Waterfall +sub_8086F64: + J: ~ +# Surf +sub_8088954: + J: ~ +#-----------# + +#---------------------# +# Starters Hoenn # +#---------------------# +Task_StarterChoose2: + J: ~ +BattleBeginFirstTurn: + J: ~ +#---------------------# + +#----------------# +# Listeners # +#----------------# +# 0x8 +S_RepelWoreOff: + J: ~ +gEggHatchData: + J: 0x300474c +CB2_EggHatch_1: + J: ~ +# Poison faint 0x5 +gUnknown_081A14B8: + J: ~ +# 0x8 +EventScript_StartTrainerBattle: + J: ~ +# 0x4 +EventScript_DoTrainerBattle: + J: ~ +#----------------# + +# Ununsed symbols that were conflicting with currently used symbols +# We set them to 0x0 to 'get them out of our way' and correctly target the desired symbol +LilycoveCity_House4_Text_18BEE8: + J: 0x0 +gTVRecentHappeningsText3: + J: 0x0 \ No newline at end of file From 59a25be788ea2dbba189b50391d9d796ab3f6a08 Mon Sep 17 00:00:00 2001 From: Neka Date: Mon, 30 Dec 2024 02:01:24 +0100 Subject: [PATCH 09/15] Support Daycare Sapphire JP --- .../symbols/patches/language/pokesapphire.yml | 56 +++++++++---------- wiki/pages/Mode - Daycare.md | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index 20c15cad..27cd786c 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -3,26 +3,26 @@ # Overworld / Util Symbols # #--------------------------------# CB2_OVERWORLD: - J: 0x8051614 + J: 0x805161c # Door exit sub_8080B9C: - J: ~ + J: 0x807da78 Task_HandleYesNoInput: - J: ~ + J: 0x80b0b4c Task_FieldMessageBox: - J: ~ + J: 0x8061c30 # 0x7 Std_MsgboxDefault: - J: ~ + J: 0x817f394 # 0x9 Std_MsgboxYesNo: - J: ~ + J: 0x817f39c WaitForAorBPress: - J: ~ + J: 0x8064405 Task_DuckBGMForPokemonCry: - J: ~ + J: 0x8072444 CB2_FlyRegionMap: - J: ~ + J: 0x80f71b0 gMain: J: 0x30016e0 gFieldMessageBoxWindow: @@ -86,13 +86,13 @@ gRngValue: J: 0x3004748 # Fly Task_MapNamePopup: - J: ~ + J: 0x809f568 CB2_LoadMap: J: ~ Task_BattleStart: J: ~ SummaryScreenHandleKeyInput: - J: ~ + J: 0x809aad8 #--------------------# # Battling Symbols # #--------------------# @@ -175,40 +175,40 @@ RunBattleScriptCommands_PopCallbacksStack: # Daycare Mode # #----------------# S_EggHatch: - J: ~ + J: 0x818be74 # EggHatch party identification gSpecialVar_0x8004: J: 0x202e620 Task_Fanfare: - J: ~ + J: 0x8071f54 #----------------# #-------------------------# # PC Menu / Storage # #-------------------------# Task_PokemonStorageSystem: - J: ~ + J: 0x8092a14 Task_HandleMultichoiceInput: - J: ~ + J: 0x80b0928 SUB_8096B38: - J: ~ + J: 0x809363c #-------------------------# #--------------# # Bag Menu # #--------------# sub_80A3118: - J: ~ + J: 0x809f6dc sCurrentBagPocket: J: 0x2038258 gBagPocketScrollStates: J: 0x3005c30 sub_80A5414: - J: ~ + J: 0x80a15d4 gPaletteFade: J: 0x202f0a8 sub_80A50C8: - J: ~ + J: 0x80a12c0 #---------------# #-----------------# @@ -216,7 +216,7 @@ sub_80A50C8: #-----------------# # Start Menu sub_80712B4: - J: ~ + J: 0x806e5f8 sStartMenuCursorPos: J: 0x202e64c sNumStartMenuActions: @@ -229,21 +229,21 @@ sCurrentStartMenuActions: # Party Menu # #----------------# HandleDefaultPartyMenu: - J: ~ + J: 0x8086b4c CB2_PartyMenuMain: - J: ~ + J: 0x80681f8 # Pokemon action menu sub_8089D94: - J: ~ + J: 0x8086c04 HandleBattlePartyMenu: - J: ~ + J: 0x8091c90 Task_HandlePopupMenuInput: - J: ~ + J: 0x8091f80 # Pokemon switch sub_806D198: - J: ~ + J: 0x806a40c HandlePartyMenuSwitchPokemonInput: - J: ~ + J: 0x8069dd8 sPokeMenuCursorPos: J: 0x202fcc4 sPokeMenuOptionsNo: @@ -320,7 +320,7 @@ S_RepelWoreOff: gEggHatchData: J: 0x300474c CB2_EggHatch_1: - J: ~ + J: 0x804022c # Poison faint 0x5 gUnknown_081A14B8: J: ~ diff --git a/wiki/pages/Mode - Daycare.md b/wiki/pages/Mode - Daycare.md index 5ff5db40..d2a595f8 100644 --- a/wiki/pages/Mode - Daycare.md +++ b/wiki/pages/Mode - Daycare.md @@ -36,7 +36,7 @@ not Shiny. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | From 01f26f1b12644768f20434c263cf42f66d173ded Mon Sep 17 00:00:00 2001 From: Neka Date: Mon, 30 Dec 2024 02:01:42 +0100 Subject: [PATCH 10/15] Support Berry Blender for Sapphire JP --- modules/data/symbols/patches/language/pokesapphire.yml | 4 ++-- wiki/pages/Mode - Berry Blender.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index 27cd786c..b84292d1 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -284,9 +284,9 @@ namingScreenDataPtr: # Berry blending # #---------------------# SUB_80501FC: - J: ~ + J: 0x804d378 gUnknown_08216303: - J: ~ + J: 0x81ec2a3 gBerryBlenderData: J: 0x3004784 #---------------------# diff --git a/wiki/pages/Mode - Berry Blender.md b/wiki/pages/Mode - Berry Blender.md index 119b77b7..510189cc 100644 --- a/wiki/pages/Mode - Berry Blender.md +++ b/wiki/pages/Mode - Berry Blender.md @@ -15,7 +15,7 @@ one with 1-3 NPCs around it as the empty ones are for multiplayer only.) | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | |:---------|:-------:|:-----------:|:----------:| | English | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | +| Japanese | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | From f3bb7737fddbd7680eeb59878b5d525bc4f18303 Mon Sep 17 00:00:00 2001 From: Neka Date: Mon, 30 Dec 2024 02:06:44 +0100 Subject: [PATCH 11/15] Support Puzzle Solver for Sapphire JP --- modules/data/symbols/patches/language/pokesapphire.yml | 2 +- wiki/pages/Mode - Puzzle Solver.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index b84292d1..612801d2 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -316,7 +316,7 @@ BattleBeginFirstTurn: #----------------# # 0x8 S_RepelWoreOff: - J: ~ + J: 0x81958b6 gEggHatchData: J: 0x300474c CB2_EggHatch_1: diff --git a/wiki/pages/Mode - Puzzle Solver.md b/wiki/pages/Mode - Puzzle Solver.md index 80208915..ab2ea8f0 100644 --- a/wiki/pages/Mode - Puzzle Solver.md +++ b/wiki/pages/Mode - Puzzle Solver.md @@ -146,23 +146,23 @@ Start bot mode anywhere inside the glass workshop. | **Mirage Tower** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Sky Pillar** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Deoxys** | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🔥 Fire Red | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🌿 LeafGreen | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Regice** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Regirock** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Registeel** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **Tanoby Key** | 🔥 Fire Red | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🌿 LeafGreen | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | **White Flute** | 🟥 Ruby | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| | 🔷 Sapphire | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | +| | 🔷 Sapphire | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | 🟢 Emerald | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working From 64a1ae3a1e7923bf50eae9905481fc2355a53dc3 Mon Sep 17 00:00:00 2001 From: Neka Date: Mon, 30 Dec 2024 23:39:34 +0100 Subject: [PATCH 12/15] Support Feebas for Sapphire JP --- modules/data/symbols/patches/language/pokesapphire.yml | 4 ++-- wiki/pages/Mode - Feebas.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index 612801d2..3dfe9aa0 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -296,10 +296,10 @@ gBerryBlenderData: #-----------# # Waterfall sub_8086F64: - J: ~ + J: 0x8083e20 # Surf sub_8088954: - J: ~ + J: 0x8085804 #-----------# #---------------------# diff --git a/wiki/pages/Mode - Feebas.md b/wiki/pages/Mode - Feebas.md index 51b13f32..5fc49379 100644 --- a/wiki/pages/Mode - Feebas.md +++ b/wiki/pages/Mode - Feebas.md @@ -56,7 +56,7 @@ The lakes marked in red are highly likely to contain a Feebas tile. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | |:---------|:-------:|:-----------:|:----------:| | English | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | +| Japanese | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | From 33697c3b99abfa4ddee3e4a85c44d0d1410f20d0 Mon Sep 17 00:00:00 2001 From: Neka Date: Tue, 31 Dec 2024 00:54:38 +0100 Subject: [PATCH 13/15] Support battling modes for Sapphire JP --- .../symbols/patches/language/pokesapphire.yml | 50 +++++++++---------- wiki/pages/Mode - Acro Bike Bunny Hop.md | 2 +- wiki/pages/Mode - Fishing.md | 2 +- wiki/pages/Mode - Level Grind.md | 2 +- wiki/pages/Mode - Spin.md | 2 +- wiki/pages/Mode - Sweet Scent.md | 2 +- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index 3dfe9aa0..641d2c05 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -97,15 +97,15 @@ SummaryScreenHandleKeyInput: # Battling Symbols # #--------------------# BattleMainCB1: - J: ~ + J: 0x800db30 BattleMainCB2: - J: ~ + J: 0x800cb38 gBattleMainFunc: J: 0x3004204 -gBattleResults: - J: 0x3004210 gBattlerControllerFuncs: J: 0x3004260 +gBattleResults: + J: 0x3004210 gBattlescriptCurrInstr: J: 0x2024970 GTASKS: @@ -136,39 +136,37 @@ gBattlePartyCurrentOrder: J: 0x203818c # Turn selection sub_8012324: - J: ~ + J: 0x800f630 sub_802C098: - J: ~ + J: 0x8029320 HandleAction_ChooseMove: - J: ~ + J: 0x80298fc # Turn selection Safari bx_battle_menu_t6_2: - J: ~ + J: 0x8126310 HandleEndTurn_FinishBattle: - J: ~ + J: 0x8010fa4 BattleScript_HandleFaintedMon: - J: ~ + J: 0x81a96a3 BattleScript_FaintedMonEnd: - J: ~ + J: 0x81a97ae CB2_WhiteOut: - J: ~ + J: 0x80516e0 gActionSelectionCursor: J: 0x2024bc0 gMoveSelectionCursor: J: 0x2024bc4 # Replace move BattleScript_AskToLearnMove: - J: ~ + J: 0x81a9941 BattleScript_ForgotAndLearnedNewMove: - J: ~ + J: 0x81a996e sub_809E260: - J: ~ + J: 0x809ab9c CB2_EvolutionSceneUpdate: - J: ~ + J: 0x810d168 Task_EvolutionScene: - J: ~ -RunBattleScriptCommands_PopCallbacksStack: - J: ~ + J: 0x810d304 #--------------------# #----------------# @@ -256,7 +254,7 @@ sPokeMenuOptionsOrder: # Fishing Mode # #-------------------# Task_Fishing: - J: ~ + J: 0x80575cc #-------------------# #---------------------# @@ -264,19 +262,19 @@ Task_Fishing: #---------------------# # 0xa BattleScript_TryNicknameCaughtMon: - J: ~ + J: 0x81aa90b sub_80B5AA0: - J: ~ + J: 0x80b10e0 Task_HandleInput: - J: ~ + J: 0x80b1838 # 0x7 BattleScript_GiveCaughtMonEnd: - J: ~ + J: 0x81aa920 # 0x6 BattleScript_GotAwaySafely: - J: ~ + J: 0x81a9851 namingScreenDataPtr: - J: ~ + J: 0x83a317c #---------------------# diff --git a/wiki/pages/Mode - Acro Bike Bunny Hop.md b/wiki/pages/Mode - Acro Bike Bunny Hop.md index 96db05fb..8530fda2 100644 --- a/wiki/pages/Mode - Acro Bike Bunny Hop.md +++ b/wiki/pages/Mode - Acro Bike Bunny Hop.md @@ -10,7 +10,7 @@ Register the Acro Bike and start the mode while in the overworld, in any patch o | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | |:---------|:-------:|:-----------:|:----------:| | English | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | +| Japanese | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Fishing.md b/wiki/pages/Mode - Fishing.md index 2ec1d64e..0cc948bc 100644 --- a/wiki/pages/Mode - Fishing.md +++ b/wiki/pages/Mode - Fishing.md @@ -34,7 +34,7 @@ if your Safari Ball count drops below `15`. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Level Grind.md b/wiki/pages/Mode - Level Grind.md index 56f4ad78..14b649f5 100644 --- a/wiki/pages/Mode - Level Grind.md +++ b/wiki/pages/Mode - Level Grind.md @@ -52,7 +52,7 @@ Try another route that has an easy overland path to a Pokémon Center. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Spin.md b/wiki/pages/Mode - Spin.md index fd7fd35b..1c80e7cf 100644 --- a/wiki/pages/Mode - Spin.md +++ b/wiki/pages/Mode - Spin.md @@ -30,7 +30,7 @@ if your Safari Ball count drops below `15`. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Sweet Scent.md b/wiki/pages/Mode - Sweet Scent.md index 6b47ed8c..542434f5 100644 --- a/wiki/pages/Mode - Sweet Scent.md +++ b/wiki/pages/Mode - Sweet Scent.md @@ -13,7 +13,7 @@ Start the mode while in the overworld, in any patch of grass/water/cave with enc | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | From c06c2826f6e091af69f24ef66daa0a18b8ef0e37 Mon Sep 17 00:00:00 2001 From: Neka Date: Tue, 31 Dec 2024 01:04:18 +0100 Subject: [PATCH 14/15] Support Starters for Sapphire JP --- .../symbols/patches/language/pokesapphire.yml | 16 ++++++++-------- wiki/pages/Mode - Starters.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index 641d2c05..51ef3d58 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -66,17 +66,17 @@ gSaveBlock2: # Main Menu # #-----------------# CB2_InitCopyrightScreenAfterBootup: - J: ~ + J: 0x813668c MainCB2_Intro: - J: ~ + J: 0x813634c CB2_InitTitleScreen: - J: ~ + J: 0x80790c8 MainCB2: - J: ~ + J: 0x807941c CB2_MainMenu: - J: ~ + J: 0x8006cd0 CB2_ReturnToFieldLocal: - J: ~ + J: 0x8051884 #-----------------# #---------------------------# @@ -304,9 +304,9 @@ sub_8088954: # Starters Hoenn # #---------------------# Task_StarterChoose2: - J: ~ + J: 0x81050f8 BattleBeginFirstTurn: - J: ~ + J: 0x800ee0c #---------------------# #----------------# diff --git a/wiki/pages/Mode - Starters.md b/wiki/pages/Mode - Starters.md index 0c127191..4e203b29 100644 --- a/wiki/pages/Mode - Starters.md +++ b/wiki/pages/Mode - Starters.md @@ -42,7 +42,7 @@ Soft resets for starter Pokémon. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | From d94f304c97b280888eee1c5022490d2486e0cdb1 Mon Sep 17 00:00:00 2001 From: Neka Date: Tue, 31 Dec 2024 01:27:07 +0100 Subject: [PATCH 15/15] Support remaining modes for Sapphire JP --- modules/data/symbols/patches/language/pokesapphire.yml | 10 +++++----- wiki/pages/Mode - Manual.md | 10 +++++----- wiki/pages/Mode - Roamer Resets.md | 2 +- wiki/pages/Mode - Rock Smash.md | 2 +- wiki/pages/Mode - Static Gift Resets.md | 2 +- wiki/pages/Mode - Static Soft Resets.md | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/data/symbols/patches/language/pokesapphire.yml b/modules/data/symbols/patches/language/pokesapphire.yml index 51ef3d58..4f4c054b 100644 --- a/modules/data/symbols/patches/language/pokesapphire.yml +++ b/modules/data/symbols/patches/language/pokesapphire.yml @@ -88,9 +88,9 @@ gRngValue: Task_MapNamePopup: J: 0x809f568 CB2_LoadMap: - J: ~ + J: 0x8051754 Task_BattleStart: - J: ~ + J: 0x807e838 SummaryScreenHandleKeyInput: J: 0x809aad8 #--------------------# @@ -321,13 +321,13 @@ CB2_EggHatch_1: J: 0x804022c # Poison faint 0x5 gUnknown_081A14B8: - J: ~ + J: 0x8180b85 # 0x8 EventScript_StartTrainerBattle: - J: ~ + J: 0x817f3ac # 0x4 EventScript_DoTrainerBattle: - J: ~ + J: 0x817f493 #----------------# # Ununsed symbols that were conflicting with currently used symbols diff --git a/wiki/pages/Mode - Manual.md b/wiki/pages/Mode - Manual.md index ed2c3f93..347762fb 100644 --- a/wiki/pages/Mode - Manual.md +++ b/wiki/pages/Mode - Manual.md @@ -10,11 +10,11 @@ Press `Tab` at any time to switch between manual mode and the most recently sele | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | 🟨 | 🟨 | 🟨 | 🟨 | 🟨 | -| German | 🟨 | 🟨 | 🟨 | 🟨 | 🟨 | -| Spanish | 🟨 | 🟨 | 🟨 | 🟨 | 🟨 | -| French | 🟨 | 🟨 | 🟨 | 🟨 | 🟨 | -| Italian | 🟨 | 🟨 | 🟨 | 🟨 | 🟨 | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | +| German | ✅ | ✅ | ✅ | ✅ | ✅ | +| Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | +| French | ✅ | ✅ | ✅ | ✅ | ✅ | +| Italian | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ Tested, working diff --git a/wiki/pages/Mode - Roamer Resets.md b/wiki/pages/Mode - Roamer Resets.md index fb57fc6b..483356b8 100644 --- a/wiki/pages/Mode - Roamer Resets.md +++ b/wiki/pages/Mode - Roamer Resets.md @@ -57,7 +57,7 @@ Unlike Emerald version, Ruby and Sapphire are not restricted by the sequence tha | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Rock Smash.md b/wiki/pages/Mode - Rock Smash.md index bdcfd50b..1f3b8ff8 100644 --- a/wiki/pages/Mode - Rock Smash.md +++ b/wiki/pages/Mode - Rock Smash.md @@ -68,7 +68,7 @@ The mode will continuously try to enter the Safari Zone, so make sure you have s | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | |:---------|:-------:|:-----------:|:----------:| | English | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | +| Japanese | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Static Gift Resets.md b/wiki/pages/Mode - Static Gift Resets.md index c7b83668..ab131335 100644 --- a/wiki/pages/Mode - Static Gift Resets.md +++ b/wiki/pages/Mode - Static Gift Resets.md @@ -138,7 +138,7 @@ Soft reset for a static gift Pokémon that are directly added to your party with | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ | diff --git a/wiki/pages/Mode - Static Soft Resets.md b/wiki/pages/Mode - Static Soft Resets.md index 98b9b2e4..7b38fbfb 100644 --- a/wiki/pages/Mode - Static Soft Resets.md +++ b/wiki/pages/Mode - Static Soft Resets.md @@ -55,7 +55,7 @@ Static soft reset mode targets static Pokémon by simply spamming the A button u | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | |:---------|:-------:|:-----------:|:----------:|:----------:|:------------:| | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ✅ | ❌ | ✅ | ✅ | ✅ | +| Japanese | ✅ | ✅ | ✅ | ✅ | ✅ | | German | ✅ | ✅ | ✅ | ✅ | ✅ | | Spanish | ✅ | ✅ | ✅ | ✅ | ✅ | | French | ✅ | ✅ | ✅ | ✅ | ✅ |