ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from thechurchofcage/gamma

Browse Source 
Core Enforcer
This commit is contained in:
DizzyEggg 2019-04-20 08:31:44 +02:00 committed by GitHub
commit 6f0e2c0838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_scripts_1.s
View File

@ -347,6 +347,18 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectVCreate .4byte BattleScript_EffectVCreate
.4byte BattleScript_EffectMatBlock .4byte BattleScript_EffectMatBlock
.4byte BattleScript_EffectStompingTantrum .4byte BattleScript_EffectStompingTantrum
.4byte BattleScript_EffectCoreEnforcer
BattleScript_EffectCoreEnforcer:
setmoveeffect MOVE_EFFECT_CORE_ENFORCER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_MoveEffectCoreEnforcer::
setgastroacid BattleScript_CoreEnforcerRet
printstring STRINGID_PKMNSABILITYSUPPRESSED
waitmessage 0x40
BattleScript_CoreEnforcerRet:
return
BattleScript_EffectVCreate: BattleScript_EffectVCreate:
setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER

1
include/battle_scripts.h
View File

@ -302,5 +302,6 @@ extern const u8 BattleScript_VCreateStatLoss[];
extern const u8 BattleScript_SpikyShieldEffect[]; extern const u8 BattleScript_SpikyShieldEffect[];
extern const u8 BattleScript_FlowerVeilProtectsRet[]; extern const u8 BattleScript_FlowerVeilProtectsRet[];
extern const u8 BattleScript_SweetVeilProtectsRet[]; extern const u8 BattleScript_SweetVeilProtectsRet[];
extern const u8 BattleScript_MoveEffectCoreEnforcer[];
#endif // GUARD_BATTLE_SCRIPTS_H #endif // GUARD_BATTLE_SCRIPTS_H

1
include/constants/battle.h
View File

@ -328,6 +328,7 @@
#define MOVE_EFFECT_SPECTRAL_THIEF 0x3F #define MOVE_EFFECT_SPECTRAL_THIEF 0x3F
#define MOVE_EFFECT_V_CREATE 0x40 #define MOVE_EFFECT_V_CREATE 0x40
#define MOVE_EFFECT_HAPPY_HOUR 0x41 #define MOVE_EFFECT_HAPPY_HOUR 0x41
#define MOVE_EFFECT_CORE_ENFORCER 0x42
#define MOVE_EFFECT_AFFECTS_USER 0x4000 #define MOVE_EFFECT_AFFECTS_USER 0x4000
#define MOVE_EFFECT_CERTAIN 0x8000 #define MOVE_EFFECT_CERTAIN 0x8000

1
include/constants/battle_move_effects.h
View File

@ -335,5 +335,6 @@
#define EFFECT_V_CREATE 329 #define EFFECT_V_CREATE 329
#define EFFECT_MAT_BLOCK 330 #define EFFECT_MAT_BLOCK 330
#define EFFECT_STOMPING_TANTRUM 331 #define EFFECT_STOMPING_TANTRUM 331
#define EFFECT_CORE_ENFORCER 332
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

7
src/battle_script_commands.c
View File

@ -2809,6 +2809,13 @@ void SetMoveEffect(bool32 primary, u32 certain)
BattleScriptPush(gBattlescriptCurrInstr + 1); BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_VCreateStatLoss; gBattlescriptCurrInstr = BattleScript_VCreateStatLoss;
break; break;
case MOVE_EFFECT_CORE_ENFORCER:
if (GetBattlerTurnOrderNum(gBattlerAttacker) > GetBattlerTurnOrderNum(gBattlerTarget))
{
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_MoveEffectCoreEnforcer;
}
break;
} }
} }
} }

2
src/data/battle_moves.h
View File

@ -9124,7 +9124,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_CORE_ENFORCER] = [MOVE_CORE_ENFORCER] =
{ {
.effect = EFFECT_PLACEHOLDER, .effect = EFFECT_CORE_ENFORCER,
.power = 100, .power = 100,
.type = TYPE_DRAGON, .type = TYPE_DRAGON,
.accuracy = 100, .accuracy = 100,