Adds battle frontier conversion script #5040

AlexOn1ine · 2024-07-26T09:26:51Z

Fixes #5006

Adds script to go along with #4313

AlexOn1ine · 2024-07-27T20:24:47Z

psf reviewed the pr an error when running the script but I can't reproduce. We are both on linux

migration_scripts/1.9/battle_frontier_convert_parties.py

pkmnsnfrn · 2024-07-27T23:08:05Z

Testing Process

Switch to master
Download script to migration_scripts/
Make script executable and run script

Original File	Post Migration File
https://raw.githubusercontent.com/rh-hideout/pokeemerald-expansion/upcoming/src/data/battle_frontier/battle_tent.h	https://hastebin.com/share/zojaqelogo
https://raw.githubusercontent.com/rh-hideout/pokeemerald-expansion/upcoming/src/data/battle_frontier/battle_frontier_mons.h	https://hastebin.com/share/ihamitorow

Diff

diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index 4ee203ea90..e3296afb9a 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -792,7 +792,7 @@ const struct TrainerMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
         .species = SPECIES_WAILMER,
         .moves = {MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE},
         .heldItem = ITEM_SITRUS_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
         .nature = NATURE_MODEST
     },
     [SLATEPORT_TENT_MON_MARILL_1] = {
@@ -834,7 +834,7 @@ const struct TrainerMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
         .species = SPECIES_LOTAD,
         .moves = {MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN},
         .heldItem = ITEM_MYSTIC_WATER,
-        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
         .nature = NATURE_DOCILE
     },
     [SLATEPORT_TENT_MON_SEEDOT] = {
@@ -1156,7 +1156,7 @@ const struct TrainerMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL},
         .heldItem = ITEM_SOFT_SAND,
-        .ev = NULL,
+        .evSpread = 0,
         .nature = NATURE_HARDY
     },
     [SLATEPORT_TENT_MON_SWALOT] = {
@@ -2048,7 +2048,7 @@ const struct TrainerMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] =
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT},
         .heldItem = ITEM_FIGY_BERRY,
-        .ev = NULL,
+        .evSpread = 0,
         .nature = NATURE_BRAVE
     },
     [VERDANTURF_TENT_MON_LOUDRED] = {

If this diff is expected, I'll go ahead and merge!

Bassoonian · 2024-07-28T11:55:00Z

If this diff is expected, I'll go ahead and merge!

If it is, it means that there was an issue in the original conversion and that this changed file should be commited, too

pkmnsnfrn · 2024-07-28T14:42:07Z

If this diff is expected, I'll go ahead and merge!

If it is, it means that there was an issue in the original conversion and that this changed file should be commited, too

Alex said its not expected via Discord

AlexOn1ine · 2024-07-30T13:42:05Z

ready for review again. I didn't fix the 0/Null difference because I don't think it is important but should be good otherwise.

pkmnsnfrn · 2024-07-30T16:41:34Z

Process

Run this from the root folder of master.

wget https://github.com/rh-hideout/pokeemerald-expansion/raw/4038c781e26ada8767241786a64bc157d44303fc/migration_scripts/1.9/battle_frontier_convert_parties.py -O migration_scripts/battle.py ;
python3 migration_scripts/battle_frontier_convert_parties.py ;
chmod +x migration_scripts/battle.py ;
python3 migration_scripts/battle.py ;
git add src/data/battle_frontier/ ;
git commit -m "make changes" ;
git diff upcoming..master -- src/data/battle_frontier > diff.txt

Result

diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h
index 7299e78a03..e83a25e829 100644
--- a/src/data/battle_frontier/battle_frontier_mons.h
+++ b/src/data/battle_frontier/battle_frontier_mons.h
@@ -2804,7 +2804,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_LUDICOLO,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH},
         .heldItem = ITEM_SHELL_BELL,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_QUIET
     },
     [FRONTIER_MON_HYPNO_1] = {
@@ -2853,7 +2853,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_ELECTABUZZ,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN},
         .heldItem = ITEM_CHERI_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_RELAXED
     },
     [FRONTIER_MON_TAUROS_1] = {
@@ -2909,7 +2909,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_MAGMAR,
         .moves = {MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER},
         .heldItem = ITEM_RAWST_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_RELAXED
     },
     [FRONTIER_MON_CRADILY_1] = {
@@ -3245,7 +3245,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_MILOTIC,
         .moves = {MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT},
         .heldItem = ITEM_LUM_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_MODEST
     },
     [FRONTIER_MON_ARCANINE_1] = {
@@ -3714,7 +3714,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_TENTACRUEL,
         .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF},
         .heldItem = ITEM_LEFTOVERS,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_HARDY
     },
     [FRONTIER_MON_AERODACTYL_2] = {
@@ -5870,7 +5870,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_REGICE,
         .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER},
         .heldItem = ITEM_LEFTOVERS,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_BRAVE
     },
     [FRONTIER_MON_REGICE_6] = {
diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index 4ee203ea90..18cb185f45 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -1156,7 +1156,7 @@ const struct TrainerMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL},
         .heldItem = ITEM_SOFT_SAND,
-        .ev = NULL,
+        .evSpread = 0,
         .nature = NATURE_HARDY
     },
     [SLATEPORT_TENT_MON_SWALOT] = {
@@ -2048,7 +2048,7 @@ const struct TrainerMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] =
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT},
         .heldItem = ITEM_FIGY_BERRY,
-        .ev = NULL,
+        .evSpread = 0,
         .nature = NATURE_BRAVE
     },
     [VERDANTURF_TENT_MON_LOUDRED] = {

AlexOn1ine · 2024-07-30T16:44:44Z

damn it. Will fix later. Sorry

pkmnsnfrn · 2024-07-30T16:49:02Z

Updated comment if you want to replicate my test

AlexOn1ine · 2024-07-31T10:14:44Z

Should be fixed. The script fixes a couple of mons in battle_frontier_mons that had incorrect evSpreads

pkmnsnfrn · 2024-07-31T14:06:30Z

diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h
index 7299e78a03..e83a25e829 100644
--- a/src/data/battle_frontier/battle_frontier_mons.h
+++ b/src/data/battle_frontier/battle_frontier_mons.h
@@ -2804,7 +2804,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_LUDICOLO,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH},
         .heldItem = ITEM_SHELL_BELL,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_QUIET
     },
     [FRONTIER_MON_HYPNO_1] = {
@@ -2853,7 +2853,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_ELECTABUZZ,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN},
         .heldItem = ITEM_CHERI_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_RELAXED
     },
     [FRONTIER_MON_TAUROS_1] = {
@@ -2909,7 +2909,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_MAGMAR,
         .moves = {MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER},
         .heldItem = ITEM_RAWST_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_RELAXED
     },
     [FRONTIER_MON_CRADILY_1] = {
@@ -3245,7 +3245,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_MILOTIC,
         .moves = {MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT},
         .heldItem = ITEM_LUM_BERRY,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_MODEST
     },
     [FRONTIER_MON_ARCANINE_1] = {
@@ -3714,7 +3714,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_TENTACRUEL,
         .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF},
         .heldItem = ITEM_LEFTOVERS,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_HARDY
     },
     [FRONTIER_MON_AERODACTYL_2] = {
@@ -5870,7 +5870,7 @@ const struct TrainerMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
         .species = SPECIES_REGICE,
         .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER},
         .heldItem = ITEM_LEFTOVERS,
-        .ev = TRAINER_PARTY_EVS(170, 170, 0, 0, 170, 0),
+        .ev = TRAINER_PARTY_EVS(170, 0, 170, 0, 170, 0),
         .nature = NATURE_BRAVE
     },
     [FRONTIER_MON_REGICE_6] = {

AlexOn1ine · 2024-07-31T14:08:17Z

You could verify it by comparing the replacement but this should be correct. They were previously wrong.

pkmnsnfrn · 2024-07-31T14:41:44Z

Ah, interesting, didn't understand the implications of your comment. Restating to make sure I understnand

The battle_frontier_mons that is currently on upcoming is wrong.
This PR adds the correct battle_frontier_mons and a migration script

I can confirm that the migration script converts to an exact copy of the new file you added.

if that's all corrected and expected, I will merge.

AlexOn1ine · 2024-07-31T20:34:52Z

1. The `battle_frontier_mons` that is currently on `upcoming` is wrong.
2. This PR adds the correct `battle_frontier_mons` and a migration script

yes this is my assumption but as a reviewer you should verify if I am correct. Meaning you should check if the evSpread that is being converted converts to the correct values.

pkmnsnfrn · 2024-07-31T21:29:27Z

I have spotcheked the few mons that are changed in this PR and they seem to be correct. However, your comment made me realize that 5a986c6 wasn't properly checked in this way - I have no way of knowing that the any version of upcoming is correct.

If that's the case, then I should do some better testing. I think 10% is reasonable, but that means comparing 92~ mons against other data to see if they match, which I'm happy to do, but won't happen for a few days.

AlexOn1ine · 2024-07-31T21:32:52Z

I have spotcheked the few mons that are changed in this PR and they seem to be correct. However, your comment made me realize that 5a986c6 wasn't properly checked in this way - I have no way of knowing that the any version of upcoming is correct.

If that's the case, then I should do some better testing. I think 10% is reasonable, but that means comparing 92~ mons against other data to see if they match, which I'm happy to do, but won't happen for a few days.

no, you don't need to check everything. I'm pretty certain it should be correct otherwise

AlexOn1ine added 2 commits July 26, 2024 11:18

Adds battle frontier conversion script

6ff2231

add desc to readme

dafe9a1

AlexOn1ine commented Jul 27, 2024

View reviewed changes

migration_scripts/1.9/battle_frontier_convert_parties.py Outdated Show resolved Hide resolved

Bassoonian added this to the 1.9.0 milestone Jul 27, 2024

AlexOn1ine added 2 commits July 30, 2024 15:32

one conversion was wrong

4913f39

missing escape

4038c78

AlexOn1ine force-pushed the battle_frontier_script branch from 922b536 to 4038c78 Compare July 30, 2024 13:41

fixed evspread0

6a0e821

pkmnsnfrn approved these changes Jul 31, 2024

View reviewed changes

pkmnsnfrn merged commit 3b9ea5b into rh-hideout:upcoming Jul 31, 2024
1 check passed

AsparagusEduardo mentioned this pull request Aug 1, 2024

Add missing migration script to convert FrontierMon parties to TrainerMon #5006

Closed

AlexOn1ine deleted the battle_frontier_script branch November 21, 2024 22:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds battle frontier conversion script #5040

Adds battle frontier conversion script #5040

AlexOn1ine commented Jul 26, 2024 •

edited

Loading

AlexOn1ine commented Jul 27, 2024

pkmnsnfrn commented Jul 27, 2024 •

edited

Loading

Bassoonian commented Jul 28, 2024

pkmnsnfrn commented Jul 28, 2024

AlexOn1ine commented Jul 30, 2024

pkmnsnfrn commented Jul 30, 2024 •

edited

Loading

AlexOn1ine commented Jul 30, 2024

pkmnsnfrn commented Jul 30, 2024

AlexOn1ine commented Jul 31, 2024

pkmnsnfrn commented Jul 31, 2024

AlexOn1ine commented Jul 31, 2024

pkmnsnfrn commented Jul 31, 2024

AlexOn1ine commented Jul 31, 2024

pkmnsnfrn commented Jul 31, 2024

AlexOn1ine commented Jul 31, 2024

Adds battle frontier conversion script #5040

Adds battle frontier conversion script #5040

Conversation

AlexOn1ine commented Jul 26, 2024 • edited Loading

AlexOn1ine commented Jul 27, 2024

pkmnsnfrn commented Jul 27, 2024 • edited Loading

Testing Process

Diff

Bassoonian commented Jul 28, 2024

pkmnsnfrn commented Jul 28, 2024

AlexOn1ine commented Jul 30, 2024

pkmnsnfrn commented Jul 30, 2024 • edited Loading

Process

Result

AlexOn1ine commented Jul 30, 2024

pkmnsnfrn commented Jul 30, 2024

AlexOn1ine commented Jul 31, 2024

pkmnsnfrn commented Jul 31, 2024

AlexOn1ine commented Jul 31, 2024

pkmnsnfrn commented Jul 31, 2024

AlexOn1ine commented Jul 31, 2024

pkmnsnfrn commented Jul 31, 2024

AlexOn1ine commented Jul 31, 2024

AlexOn1ine commented Jul 26, 2024 •

edited

Loading

pkmnsnfrn commented Jul 27, 2024 •

edited

Loading

pkmnsnfrn commented Jul 30, 2024 •

edited

Loading