From 6c5852c4e0f2283693f1e859863a80b6708990e7 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Thu, 31 Dec 2020 13:13:10 -0500 Subject: [PATCH 1/2] colors n stuff --- graphics/pokemon/mawile/footprint.png | Bin 102 -> 160 bytes src/data/pokemon/base_stats.h | 70 +++++++++++++++----------- 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/graphics/pokemon/mawile/footprint.png b/graphics/pokemon/mawile/footprint.png index 5195fd4df21c010d1ee029375a0d6ff1c846d8bc..2aa7148e790c3c91b4a07021c034850d4d6777c1 100644 GIT binary patch delta 142 zcmYdWz&Js&o|%DxLDe=_2}m&(2e~^jtUD+363Agmcl32+VA$Bt{U?zX$Y%@i332`Z z|38o!dgyW;km4-xh%9Dc;1&X5#!GkW{s0A)JzX3_BrYd6Fsre%iLtWDF|+MsV*AG* laO7V@<4*=BUS?*7+Fz_E_Icfp1}bOZ@O1TaS?83{1ORzWC$Rtk delta 83 zcmZ3$m^MMumjMXOI}V)zQo5cljv*W~lYji5|8TwS;rBlkzD%6|kXh(g&HRV+Z4dKT lw#k3vsedKep!NShI|EOdnEki5mmDAiJYD@<);T3K0RWB5A`t)p diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index a99896e17..51b48b914 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -3123,7 +3123,12 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + #ifdef BATTLE_ENGINE + .abilities = {ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS}, + #else + .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + #endif + .abilityHidden = ABILITY_STENCH, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, }, @@ -3148,7 +3153,12 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + #ifdef BATTLE_ENGINE + .abilities = {ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS}, + #else + .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + #endif + .abilityHidden = ABILITY_STENCH, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, }, @@ -17265,7 +17275,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, .abilities = {ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY}, - #if P_UPDATED_ABILITY >= GEN_6 + #if P_UPDATED_ABILITIES >= GEN_6 #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_INFILTRATOR, #endif @@ -17296,7 +17306,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, .abilities = {ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY}, - #if P_UPDATED_ABILITY >= GEN_6 + #if P_UPDATED_ABILITIES >= GEN_6 #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_INFILTRATOR, #endif @@ -17327,7 +17337,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, .abilities = {ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY}, - #if P_UPDATED_ABILITY >= GEN_6 + #if P_UPDATED_ABILITIES >= GEN_6 #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_INFILTRATOR, #endif @@ -29334,7 +29344,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, - .bodyColor = BODY_COLOR_GREEN, + .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, @@ -29358,7 +29368,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, - .bodyColor = BODY_COLOR_GREEN, + .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, @@ -30275,7 +30285,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, #endif .abilityHidden = ABILITY_SERENE_GRACE, - .bodyColor = BODY_COLOR_PINK, + .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, }, @@ -30304,7 +30314,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, #endif .abilityHidden = ABILITY_SERENE_GRACE, - .bodyColor = BODY_COLOR_PINK, + .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, @@ -30333,7 +30343,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, #endif .abilityHidden = ABILITY_SERENE_GRACE, - .bodyColor = BODY_COLOR_PINK, + .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, @@ -30813,7 +30823,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, }, @@ -30842,7 +30852,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, }, @@ -30871,7 +30881,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, }, @@ -30900,7 +30910,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, }, @@ -30929,7 +30939,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, }, @@ -30958,7 +30968,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, }, @@ -30987,7 +30997,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, @@ -31016,7 +31026,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, }, @@ -31045,7 +31055,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, @@ -31074,7 +31084,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, @@ -31103,7 +31113,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, @@ -31132,7 +31142,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, @@ -31161,7 +31171,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, }, @@ -31190,7 +31200,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, }, @@ -31219,7 +31229,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, @@ -31248,7 +31258,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, @@ -31277,7 +31287,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, }, @@ -31306,7 +31316,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, }, @@ -31335,7 +31345,7 @@ const struct BaseStats gBaseStats[] = #ifdef BATTLE_ENGINE .abilityHidden = ABILITY_FRIEND_GUARD, #endif - .bodyColor = BODY_COLOR_WHITE, + .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, @@ -32360,7 +32370,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, - .friendship = 100, + .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, From 08eb883939555ea6872140705e9aa7b8d886bd14 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Thu, 21 Jan 2021 20:10:38 -0500 Subject: [PATCH 2/2] sounds like a lot of HOOPA --- src/data/pokemon/base_stats.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 51b48b914..738bc0455 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -32370,7 +32370,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, - .friendship = 70, + .friendship = 100, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED,