ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid

Browse Source 
Config for Dark Void being only usable by Darkrai
This commit is contained in:
BuffelSaft 2022-11-05 22:42:51 +13:00 committed by GitHub
commit 1da4eb3b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/battle_scripts_1.s
View File

@ -411,6 +411,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectSteelBeam @ EFFECT_STEEL_BEAM .4byte BattleScript_EffectSteelBeam @ EFFECT_STEEL_BEAM
.4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST .4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST
.4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN .4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN
.4byte BattleScript_EffectDarkVoid @ EFFECT_DARK_VOID
BattleScript_AffectionBasedEndurance:: BattleScript_AffectionBasedEndurance::
playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON
@ -775,9 +776,7 @@ BattleScript_EffectPhotonGeyser:
BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE goto BattleScript_PokemonCantUseTheMove
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectClangorousSoul: BattleScript_EffectClangorousSoul:
attackcanceler attackcanceler
@ -889,9 +888,7 @@ BattleScript_BothCanNoLongerEscape::
BattleScript_EffectHyperspaceFury: BattleScript_EffectHyperspaceFury:
jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE goto BattleScript_PokemonCantUseTheMove
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectHyperspaceFuryUnbound:: BattleScript_EffectHyperspaceFuryUnbound::
attackcanceler attackcanceler
@ -3023,6 +3020,11 @@ BattleScript_MoveMissed::
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectDarkVoid::
.if B_DARK_VOID_FAIL >= GEN_7
jumpifspecies BS_ATTACKER, SPECIES_DARKRAI, BattleScript_EffectSleep
goto BattleScript_PokemonCantUseTheMove
.endif
BattleScript_EffectSleep:: BattleScript_EffectSleep::
attackcanceler attackcanceler
attackstring attackstring
@ -9790,3 +9792,11 @@ BattleScript_TargetAbilityStatRaiseRet::
call BattleScript_StatUp call BattleScript_StatUp
BattleScript_TargetAbilityStatRaiseRet_End: BattleScript_TargetAbilityStatRaiseRet_End:
return return
BattleScript_PokemonCantUseTheMove::
attackstring
ppreduce
pause B_WAIT_TIME_SHORT
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd

1
include/constants/battle_config.h
View File

@ -91,6 +91,7 @@
#define B_METRONOME_MOVES GEN_LATEST // This config will determine up to which generation will Metronome pull moves from. #define B_METRONOME_MOVES GEN_LATEST // This config will determine up to which generation will Metronome pull moves from.
#define B_TELEPORT_BEHAVIOR GEN_LATEST // In Gen7+, starting with Pokémon LGPE, Teleport allows the user to swap out with another party member. #define B_TELEPORT_BEHAVIOR GEN_LATEST // In Gen7+, starting with Pokémon LGPE, Teleport allows the user to swap out with another party member.
#define B_BEAT_UP GEN_LATEST // In Gen5+, Beat Up uses a different formula to calculate its damage, and deals Dark-type damage. Prior to Gen 5, each hit also announces the party member's name. #define B_BEAT_UP GEN_LATEST // In Gen5+, Beat Up uses a different formula to calculate its damage, and deals Dark-type damage. Prior to Gen 5, each hit also announces the party member's name.
#define B_DARK_VOID_FAIL GEN_LATEST // In Gen7+, only Darkrai can use Dark Void.
// Ability settings // Ability settings
#define B_EXPANDED_ABILITY_NAMES TRUE // If TRUE, ability names are increased from 12 characters to 16 characters. #define B_EXPANDED_ABILITY_NAMES TRUE // If TRUE, ability names are increased from 12 characters to 16 characters.

1
include/constants/battle_move_effects.h
View File

@ -392,6 +392,7 @@
#define EFFECT_STEEL_BEAM 386 #define EFFECT_STEEL_BEAM 386
#define EFFECT_EXTREME_EVOBOOST 387 #define EFFECT_EXTREME_EVOBOOST 387
#define EFFECT_DAMAGE_SET_TERRAIN 388 // genesis supernova #define EFFECT_DAMAGE_SET_TERRAIN 388 // genesis supernova
#define EFFECT_DARK_VOID 389
#define NUM_BATTLE_MOVE_EFFECTS 389 #define NUM_BATTLE_MOVE_EFFECTS 389

2
src/data/battle_moves.h
View File

@ -8339,7 +8339,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
#else #else
.accuracy = 80, .accuracy = 80,
#endif #endif
.effect = EFFECT_SLEEP, .effect = EFFECT_DARK_VOID,
.power = 0, .power = 0,
.type = TYPE_DARK, .type = TYPE_DARK,
.pp = 10, .pp = 10,