Epsilon_02/pokeemerald-modern
1
0
Fork 0
mirror of https://github.com/resetes12/pokeemerald synced 2025-10-06 00:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Spinda buff

Browse Source
This commit is contained in:
resetes12
2023-06-09 17:32:51 +02:00
parent 62261bc482
commit 14e42f95b7
6 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/battle_scripts_1.s
View File

@@ -3659,6 +3659,26 @@ BattleScript_AtkDefDown_TryDef::
BattleScript_AtkDefDown_End::
return
BattleScript_AtkDefUp::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AtkDefUp_2
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_AtkDefUp_2::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefUp_3
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AtkDefUp_3
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefUp_3:
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefUp_4
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AtkDefUp_4
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefUp_4::
return
BattleScript_KnockedOff::
playanimation BS_TARGET, B_ANIM_ITEM_KNOCKOFF
printstring STRINGID_PKMNKNOCKEDOFF

1
include/battle_scripts.h
View File

@@ -86,6 +86,7 @@ extern const u8 BattleScript_SelectingNotAllowedMoveTauntInPalace[];
extern const u8 BattleScript_WishComesTrue[];
extern const u8 BattleScript_IngrainTurnHeal[];
extern const u8 BattleScript_AtkDefDown[];
extern const u8 BattleScript_AtkDefUp[];
extern const u8 BattleScript_KnockedOff[];
extern const u8 BattleScript_MoveUsedIsImprisoned[];
extern const u8 BattleScript_SelectingImprisonedMove[];

13
src/battle_script_commands.c
View File

@@ -2341,6 +2341,7 @@ u8 GetBattlerTurnOrderNum(u8 battlerId)
void SetMoveEffect(bool8 primary, u8 certain)
{
struct BattlePokemon *attacker;
bool32 statusChanged = FALSE;
u8 affectsUser = 0; // 0x40 otherwise
bool32 noSunCanFreeze = TRUE;
@@ -2948,8 +2949,16 @@ void SetMoveEffect(bool8 primary, u8 certain)
}
break;
case MOVE_EFFECT_ATK_DEF_DOWN: // SuperPower
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_AtkDefDown;
if ((gBattleMons[gBattlerAttacker].species == SPECIES_SPINDA) && ((Random() % 100) <= 51))
{
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_AtkDefUp;
}
else
{
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_AtkDefDown;
}
break;
case MOVE_EFFECT_RECOIL_33: // Double Edge
gBattleMoveDamage = gHpDealt / 3;

3
src/data/pokemon/level_up_learnsets.h
View File

@@ -5151,13 +5151,16 @@ static const u16 sBreloomLevelUpLearnset[] = {
static const u16 sSpindaLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_UPROAR),
LEVEL_UP_MOVE( 9, MOVE_COVET),
LEVEL_UP_MOVE(12, MOVE_FAINT_ATTACK),
LEVEL_UP_MOVE(16, MOVE_PSYBEAM),
LEVEL_UP_MOVE(23, MOVE_HYPNOSIS),
LEVEL_UP_MOVE(27, MOVE_DIZZY_PUNCH),
LEVEL_UP_MOVE(29, MOVE_PLAY_ROUGH),
LEVEL_UP_MOVE(34, MOVE_TEETER_DANCE),
LEVEL_UP_MOVE(36, MOVE_BODY_SLAM),
LEVEL_UP_MOVE(38, MOVE_PSYCH_UP),
LEVEL_UP_MOVE(42, MOVE_SUPERPOWER),
LEVEL_UP_MOVE(45, MOVE_DOUBLE_EDGE),
LEVEL_UP_MOVE(49, MOVE_FLAIL),
LEVEL_UP_MOVE(56, MOVE_THRASH),

14
src/data/pokemon/species_info.h
View File

@@ -8546,14 +8546,14 @@ const struct SpeciesInfo gSpeciesInfo[] =
.noFlip = FALSE,
},
[SPECIES_SPINDA] =
[SPECIES_SPINDA] = //buffed, +10 in everything
{
.baseHP = 60,
.baseAttack = 60,
.baseDefense = 60,
.baseSpeed = 60,
.baseSpAttack = 60,
.baseSpDefense = 60,
.baseHP = 70,
.baseAttack = 70,
.baseDefense = 70,
.baseSpeed = 70,
.baseSpAttack = 70,
.baseSpDefense = 70,
.types = { TYPE_NORMAL, TYPE_NORMAL },
.catchRate = 255,
.expYield = 85,

3
src/pokemon.c
View File

@@ -6259,7 +6259,8 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
spAttack = (150 * spAttack) / 100;
if (attacker->ability == ABILITY_MINUS && ABILITY_ON_FIELD2(ABILITY_PLUS))
spAttack = (150 * spAttack) / 100;
if ((attacker->species == SPECIES_SPINDA) && ((Random() % 100) <= 2))
gBattleMovePower = (200 * gBattleMovePower) / 100;
if ((gSaveBlock2Ptr->optionsDifficulty == 2))
{
// Sceptile gets Thick Fat to reduce dmg from their weaknesses, and a 10% dmg increase.