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 #140 from thechurchofcage/beta

Browse Source 
Laser Focus
This commit is contained in:
DizzyEggg 2019-04-20 21:05:05 +02:00 committed by GitHub
commit 0b7aef1c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_scripts_1.s
View File

@ -349,6 +349,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectStompingTantrum .4byte BattleScript_EffectStompingTantrum
.4byte BattleScript_EffectCoreEnforcer .4byte BattleScript_EffectCoreEnforcer
.4byte BattleScript_EffectThroatChop .4byte BattleScript_EffectThroatChop
.4byte BattleScript_EffectLaserFocus
BattleScript_EffectCoreEnforcer: BattleScript_EffectCoreEnforcer:
setmoveeffect MOVE_EFFECT_CORE_ENFORCER | MOVE_EFFECT_CERTAIN setmoveeffect MOVE_EFFECT_CORE_ENFORCER | MOVE_EFFECT_CERTAIN
@ -361,6 +362,17 @@ BattleScript_MoveEffectCoreEnforcer::
BattleScript_CoreEnforcerRet: BattleScript_CoreEnforcerRet:
return return
BattleScript_EffectLaserFocus:
attackcanceler
attackstring
ppreduce
setuserstatus3 STATUS3_LASER_FOCUS BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_LASERFOCUS
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_EffectVCreate: BattleScript_EffectVCreate:
setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit goto BattleScript_EffectHit

3
include/constants/battle_move_effects.h
View File

@ -336,8 +336,7 @@
#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 #define EFFECT_CORE_ENFORCER 332
#define EFFECT_THROAT_CHOP 334 #define EFFECT_THROAT_CHOP 334
#define EFFECT_LASER_FOCUS 335
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

2
include/constants/battle_string_ids.h
View File

@ -528,9 +528,9 @@
#define STRINGID_SWEETVEILPROTECTED 524 #define STRINGID_SWEETVEILPROTECTED 524
#define STRINGID_AROMAVEILPROTECTED 525 #define STRINGID_AROMAVEILPROTECTED 525
#define STRINGID_CELEBRATEMESSAGE 526 #define STRINGID_CELEBRATEMESSAGE 526
#define STRINGID_THROATCHOPENDS 528 #define STRINGID_THROATCHOPENDS 528
#define STRINGID_PKMNCANTUSEMOVETHROATCHOP 529 #define STRINGID_PKMNCANTUSEMOVETHROATCHOP 529
#define STRINGID_LASERFOCUS 530
#define BATTLESTRINGS_COUNT 530 #define BATTLESTRINGS_COUNT 530

3
src/battle_message.c
View File

@ -655,12 +655,13 @@ static const u8 sText_FlowerVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrou
static const u8 sText_SweetVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrounded itself\nwith a veil of sweetness!"); static const u8 sText_SweetVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrounded itself\nwith a veil of sweetness!");
static const u8 sText_AromaVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} is protected\nby an aromatic veil!"); static const u8 sText_AromaVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} is protected\nby an aromatic veil!");
static const u8 sText_CelebrateMessage[] = _("Congratulations, {B_PLAYER_NAME}!"); static const u8 sText_CelebrateMessage[] = _("Congratulations, {B_PLAYER_NAME}!");
static const u8 sText_LaserFocusMessage[] = _("{B_ATK_NAME_WITH_PREFIX}\nconcentrated intensely!");
const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
{ {
[STRINGID_LASERFOCUS - 12] = sText_LaserFocusMessage,
[STRINGID_THROATCHOPENDS - 12] = sText_ThroatChopEnds, [STRINGID_THROATCHOPENDS - 12] = sText_ThroatChopEnds,
[STRINGID_PKMNCANTUSEMOVETHROATCHOP - 12] = sText_PkmnCantUseMoveThroatChop, [STRINGID_PKMNCANTUSEMOVETHROATCHOP - 12] = sText_PkmnCantUseMoveThroatChop,
[STRINGID_CELEBRATEMESSAGE - 12] = sText_CelebrateMessage, [STRINGID_CELEBRATEMESSAGE - 12] = sText_CelebrateMessage,
[STRINGID_AROMAVEILPROTECTED - 12] = sText_AromaVeilProtected, [STRINGID_AROMAVEILPROTECTED - 12] = sText_AromaVeilProtected,
[STRINGID_SWEETVEILPROTECTED - 12] = sText_SweetVeilProtected, [STRINGID_SWEETVEILPROTECTED - 12] = sText_SweetVeilProtected,

4
src/battle_script_commands.c
View File

@ -10416,8 +10416,10 @@ static void atkDD_setuserstatus3(void)
else else
{ {
gStatuses3[gBattlerAttacker] |= flags; gStatuses3[gBattlerAttacker] |= flags;
if (flags == STATUS3_MAGNET_RISE) if (flags & STATUS3_MAGNET_RISE)
gDisableStructs[gBattlerAttacker].magnetRiseTimer = 5; gDisableStructs[gBattlerAttacker].magnetRiseTimer = 5;
if (flags & STATUS3_LASER_FOCUS)
gDisableStructs[gBattlerAttacker].laserFocusTimer = 2;
gBattlescriptCurrInstr += 9; gBattlescriptCurrInstr += 9;
} }
} }

2
src/data/battle_moves.h
View File

@ -8928,7 +8928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_LASER_FOCUS] = [MOVE_LASER_FOCUS] =
{ {
.effect = EFFECT_PLACEHOLDER, .effect = EFFECT_LASER_FOCUS,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,