Merge branch 'master' into Unbound

This commit is contained in:
Skeli
2020-02-26 19:06:19 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -74,7 +74,7 @@
#define ABILITY_ARENATRAP 0x47
#define ABILITY_VITALSPIRIT 0x48
#define ABILITY_WHITESMOKE 0x49
#define ABILITY_NEUTRALIINGGAS 0x4A
#define ABILITY_NEUTRALIZINGGAS 0x4A
#define ABILITY_SHELLARMOR 0x4B
#define ABILITY_HUNGERSWITCH 0x4C
#define ABILITY_AIRLOCK 0x4D

View File

@@ -3602,7 +3602,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_AMORPHOUS,
.ability1 = ABILITY_LEVITATE,
.ability2 = ABILITY_NONE, //ABILITY_NEUTRALIZINGGAS, - Not ready yet
.ability2 = ABILITY_NEUTRALIZINGGAS,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,
.noFlip = TRUE,
@@ -3635,7 +3635,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_AMORPHOUS,
.ability1 = ABILITY_LEVITATE,
.ability2 = ABILITY_NONE, //ABILITY_NEUTRALIZINGGAS, - Not ready yet
.ability2 = ABILITY_NEUTRALIZINGGAS,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,
.noFlip = TRUE,