diff options
| author | tom-overton <tom.overton@outlook.com> | 2022-12-05 04:14:49 -0800 |
|---|---|---|
| committer | Rafael Marcalo <raroma09@gmail.com> | 2022-12-05 21:41:57 +0000 |
| commit | 19b36086f6381fe75b00ed097180e2bd576d1ec3 (patch) | |
| tree | 69ab4a0beed7d8a3c3c83ec20a337d4b0fc88a19 /src/com | |
| parent | 70569688f47ea59ef171a6a6e9c98fa658cee2d1 (diff) | |
USUM: Fix an issue where Mega Scizor's stats were updated instead of Aegislash-B's
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java | 4 | ||||
| -rw-r--r-- | src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java b/src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java index 0017cdd..012021f 100644 --- a/src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java +++ b/src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java @@ -1150,10 +1150,10 @@ public class Gen6RomHandler extends Abstract3DSRomHandler { Map<Integer, StatChange> map = GlobalConstants.getStatChanges(generation); switch(generation) { case 7: - map.put(781,new StatChange(Stat.SPDEF.val,105)); + map.put(Species.Gen6Formes.alakazamMega, new StatChange(Stat.SPDEF.val, 105)); break; case 8: - map.put(776,new StatChange(Stat.ATK.val | Stat.SPATK.val,140,140)); + map.put(Species.Gen6Formes.aegislashB, new StatChange(Stat.ATK.val | Stat.SPATK.val, 140, 140)); break; } return map; diff --git a/src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java b/src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java index f0d315b..1a9909b 100644 --- a/src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java +++ b/src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java @@ -1253,9 +1253,13 @@ public class Gen7RomHandler extends Abstract3DSRomHandler { @Override public Map<Integer, StatChange> getUpdatedPokemonStats(int generation) { Map<Integer, StatChange> map = GlobalConstants.getStatChanges(generation); + int aegislashBlade = Species.SMFormes.aegislashB; + if (romEntry.romType == Gen7Constants.Type_USUM) { + aegislashBlade = Species.USUMFormes.aegislashB; + } switch(generation) { case 8: - map.put(859,new StatChange(Stat.ATK.val | Stat.SPATK.val,140,140)); + map.put(aegislashBlade, new StatChange(Stat.ATK.val | Stat.SPATK.val, 140, 140)); break; } return map; |