diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/effect_commands.asm | 10 | ||||
| -rw-r--r-- | src/engine/effect_functions.asm | 48 |
2 files changed, 52 insertions, 6 deletions
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index b92f5b6..7021bd9 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -205,17 +205,17 @@ NidoranMHornHazardEffectCommands: db $00 NidorinaSupersonicEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $4aac + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, NidorinaSupersonicEffect db $00 NidorinaDoubleKickEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $4abb - dbw EFFECTCMDTYPE_AI, $4ab3 + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, NidorinaDoubleKick_MultiplierEffect + dbw EFFECTCMDTYPE_AI, NidorinaDoubleKick_AIEffect db $00 NidorinoDoubleKickEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $4adb - dbw EFFECTCMDTYPE_AI, $4ad3 + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, NidorinoDoubleKick_MultiplierEffect + dbw EFFECTCMDTYPE_AI, NidorinoDoubleKick_AIEffect db $00 ButterfreeWhirlwindEffectCommands: diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 2123fd8..5414ace 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -1359,7 +1359,53 @@ HornHazard_Failure50PercentEffect: ; 2ca96 (b:4a96) ret ; 0x2caac - INCROM $2caac, $2cbfb +NidorinaSupersonicEffect: ; 2caac (b:4aac) + call Confusion50PercentEffect + call nc, SetNoEffectFromStatus + ret +; 0x2cab3 + +NidorinaDoubleKick_AIEffect: ; 2cab3 (b:4ab3) + ld a, 30 + lb de, 0, 60 + jp StoreAIDamageInfo +; 0x2cabb + +NidorinaDoubleKick_MultiplierEffect: ; 2cabb (b:4abb) + ld hl, 30 + call LoadTxRam3 + ldtx de, DamageCheckIfHeadsXDamageText + ld a, 2 + call TossCoinATimes_BankB + ld e, a + add a + add e + call ATimes10 + call StoreDamageInfo + ret +; 0x2cad3 + +NidorinoDoubleKick_AIEffect: ; 2cad3 (b:4ad3) + ld a, 30 + lb de, 0, 60 + jp StoreAIDamageInfo +; 0x2cadb + +NidorinoDoubleKick_MultiplierEffect: ; 2cabb (b:4abb) + ld hl, 30 + call LoadTxRam3 + ldtx de, DamageCheckIfHeadsXDamageText + ld a, 2 + call TossCoinATimes_BankB + ld e, a + add a + add e + call ATimes10 + call StoreDamageInfo + ret +; 0x2caf3 + + INCROM $2caf3, $2cbfb Func_2cbfb: ; 2cbfb (b:4bfb) ldh a, [hAIEnergyTransPlayAreaLocation] |