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

Fixed Fling when gLastUsedItem is 0

Browse Source 
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
This commit is contained in:
LOuroboros 2021-11-15 14:02:33 -03:00
parent de74177966
commit 5c485d9769
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_script.inc
View File

@ -1925,8 +1925,8 @@
various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK
.endm .endm
.macro jumpifnoflingpower battler:req, ptr:req .macro jumpifflingfails battler:req, ptr:req
various \battler, VARIOUS_JUMP_IF_NO_FLING_POWER various \battler, VARIOUS_JUMP_IF_FLING_FAILS
.4byte \ptr .4byte \ptr
.endm .endm

2
data/battle_scripts_1.s
View File

@ -405,7 +405,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_BOLT_BEAK .4byte BattleScript_EffectHit @ EFFECT_BOLT_BEAK
BattleScript_EffectFling: BattleScript_EffectFling:
jumpifnoflingpower BS_ATTACKER, BattleScript_ButItFailedAtkStringPpReduce jumpifflingfails BS_ATTACKER, BattleScript_ButItFailedAtkStringPpReduce
jumpifstatus3 BS_ATTACKER, STATUS3_EMBARGO, BattleScript_ButItFailedAtkStringPpReduce jumpifstatus3 BS_ATTACKER, STATUS3_EMBARGO, BattleScript_ButItFailedAtkStringPpReduce
jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_MAGIC_ROOM, BattleScript_ButItFailedAtkStringPpReduce jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_MAGIC_ROOM, BattleScript_ButItFailedAtkStringPpReduce
.if B_KLUTZ_FLING_INTERACTION >= GEN_5 .if B_KLUTZ_FLING_INTERACTION >= GEN_5

2
include/constants/battle_script_commands.h
View File

@ -208,7 +208,7 @@
#define VARIOUS_SET_OCTOLOCK 135 #define VARIOUS_SET_OCTOLOCK 135
#define VARIOUS_CUT_1_3_HP_RAISE_STATS 136 #define VARIOUS_CUT_1_3_HP_RAISE_STATS 136
#define VARIOUS_TRY_END_NEUTRALIZING_GAS 137 #define VARIOUS_TRY_END_NEUTRALIZING_GAS 137
#define VARIOUS_JUMP_IF_NO_FLING_POWER 138 #define VARIOUS_JUMP_IF_FLING_FAILS 138
#define VARIOUS_JUMP_IF_HOLD_EFFECT 139 #define VARIOUS_JUMP_IF_HOLD_EFFECT 139
#define VARIOUS_CURE_CERTAIN_STATUSES 140 #define VARIOUS_CURE_CERTAIN_STATUSES 140
#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 141 #define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 141

8
src/battle_script_commands.c
View File

@ -9285,12 +9285,16 @@ static void Cmd_various(void)
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
return; return;
} }
case VARIOUS_JUMP_IF_NO_FLING_POWER: case VARIOUS_JUMP_IF_FLING_FAILS:
#ifdef ITEM_EXPANSION #ifdef ITEM_EXPANSION
if (!ItemId_GetFlingPower(gBattleMons[gActiveBattler].item)) if (!ItemId_GetFlingPower(gBattleMons[gActiveBattler].item))
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
else else if (gLastUsedItem == ITEM_NONE)
#else
if (gLastUsedItem == ITEM_NONE)
#endif #endif
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
else
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
return; return;
case VARIOUS_CURE_CERTAIN_STATUSES: case VARIOUS_CURE_CERTAIN_STATUSES: