Skip to content

Commit 31cf908

Browse files
authored
Merge pull request #2 from Salsbar/issue/1
Issue/1
2 parents 3c5d024 + 1212867 commit 31cf908

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

.github/workflows/makefile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Makefile CI
22

33
on:
44
push:
5-
branches: [ unovared ]
5+
branches: [ unovared, issue/* ]
66

77
jobs:
88
build:

constants/move_effect_constants.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ const_value = 0
9191
const LEECH_SEED_EFFECT ; $54
9292
const SPLASH_EFFECT ; $55
9393
const DISABLE_EFFECT ; $56
94+
const ATTACK_UP1_SIDE_EFFECT ; $57
9495

9596
; fixed damage constants
9697
SONICBOOM_DAMAGE EQU 20

data/moves.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ MoveEnd:
141141
move GIGA_DRAIN, DRAIN_HP_EFFECT, 75, GRASS, 100, 10
142142
move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20
143143
move SKULL_BASH, CHARGE_EFFECT, 120, NORMAL, 100, 15
144-
move METAL_CLAW, NO_ADDITIONAL_EFFECT, 50, STEEL, 100, 35
144+
move METAL_CLAW, ATTACK_UP1_SIDE_EFFECT, 50, STEEL, 95, 35
145145
move IRON_HEAD, FLINCH_SIDE_EFFECT1, 80, STEEL, 100, 15
146146
move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC, 100, 20
147147
move CRUNCH, DEFENSE_DOWN_SIDE_EFFECT, 80, DARK, 100, 15

engine/battle/core.asm

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7223,6 +7223,7 @@ MoveEffectPointerTable:
72237223
dw LeechSeedEffect ; LEECH_SEED_EFFECT
72247224
dw SplashEffect ; SPLASH_EFFECT
72257225
dw DisableEffect ; DISABLE_EFFECT
7226+
dw AttackUp1SideEffect ; ATTACK_UP1_SIDE_EFFECT
72267227

72277228
SleepEffect:
72287229
ld de, wEnemyMonStatus
@@ -8750,4 +8751,22 @@ ShiftGearEffect:
87508751
ld a, SPEED_UP2_EFFECT
87518752
ld [wPlayerMoveEffect], a
87528753
jp StatModifierUpEffect
8753-
8754+
8755+
AttackUp1SideEffect:
8756+
ld a, [H_WHOSETURN]
8757+
and a
8758+
jr z, .notEnemyTurn
8759+
;Enemy's turn
8760+
call BattleRandom
8761+
cp $19 ; ~10% chance
8762+
ret nc
8763+
ld a, ATTACK_UP1_EFFECT
8764+
ld [wEnemyMoveEffect], a
8765+
jp StatModifierUpEffect
8766+
.notEnemyTurn
8767+
call BattleRandom
8768+
cp $19 ; ~10% chance
8769+
ret nc
8770+
ld a, ATTACK_UP1_EFFECT
8771+
ld [wPlayerMoveEffect], a
8772+
jp StatModifierUpEffect

0 commit comments

Comments
 (0)