From a3d2aee4fb7427393ae0d28a558488af493bb1b3 Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Mon, 11 May 2020 10:30:31 +0100
Subject: NidoranM Horn Hazard effect

---
 src/data/effect_commands.asm    |  4 ++--
 src/engine/effect_functions.asm | 22 +++++++++++++++++++++-
 src/text/text1.asm              |  2 +-
 src/text/text_offsets.asm       |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index bcf6636..b92f5b6 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -200,8 +200,8 @@ NidoranFCallForFamilyEffectCommands:
 	db  $00
 
 NidoranMHornHazardEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $4a96
-	dbw EFFECTCMDTYPE_AI, $4a8e
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, HornHazard_Failure50PercentEffect
+	dbw EFFECTCMDTYPE_AI, HornHazard_AIEffect
 	db  $00
 
 NidorinaSupersonicEffectCommands:
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 8075a71..2123fd8 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -1339,7 +1339,27 @@ NidoranFCallForFamily_PutInPlayAreaEffect: ; 2ca6e (b:4a6e)
 	ret
 ; 0x2ca8e
 
-	INCROM $2ca8e, $2cbfb
+HornHazard_AIEffect: ; 2ca8e (b:4a8e)
+	ld a, 15
+	lb de, 0, 30
+	jp StoreAIDamageInfo
+; 0x2ca96
+
+HornHazard_Failure50PercentEffect: ; 2ca96 (b:4a96)
+	ldtx de, DamageCheckIfTailsNoDamageText
+	call TossCoin_BankB
+	jr c, .heads
+	xor a
+	call StoreDamageInfo
+	call SetWasUnsuccessful
+	ret
+.heads
+	ld a, $01
+	ld [wLoadedMoveAnimation], a
+	ret
+; 0x2caac
+
+	INCROM $2caac, $2cbfb
 
 Func_2cbfb: ; 2cbfb (b:4bfb)
 	ldh a, [hAIEnergyTransPlayAreaLocation]
diff --git a/src/text/text1.asm b/src/text/text1.asm
index ff07f9d..edac289 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -1078,7 +1078,7 @@ Text00e5: ; 37d1f (d:7d1f)
 	line "becomes Confused."
 	done
 
-Text00e6: ; 37d4a (d:7d4a)
+DamageCheckIfTailsNoDamageText: ; 37d4a (d:7d4a)
 	text "Damage check!"
 	line "If Tails, no damage!!!"
 	done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 5cc70d0..a4eac01 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -231,7 +231,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer ConfusionCheckText                                 ; 0x00e3
 	textpointer VenomPowderCheckText                               ; 0x00e4
 	textpointer Text00e5                                           ; 0x00e5
-	textpointer Text00e6                                           ; 0x00e6
+	textpointer DamageCheckIfTailsNoDamageText                     ; 0x00e6
 	textpointer Text00e7                                           ; 0x00e7
 	textpointer Text00e8                                           ; 0x00e8
 	textpointer IfHeadPlus10IfTails10ToYourselfText                ; 0x00e9
-- 
cgit v1.2.3