thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Struggle fixes

Browse source
This commit is contained in:
MementoMartha 2022-09-12 22:16:45 +01:00
parent 75d4e47586
commit aba9da027c
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/moves/animations.asm
View file

@ -164,7 +164,6 @@ AttackAnimationPointers:
dw SuperFangAnim
dw SlashAnim
dw SubstituteAnim
dw StruggleAnim
dw FairyWindAnim
dw DrainingKissAnim
dw MetalSoundAnim
@ -178,6 +177,7 @@ AttackAnimationPointers:
dw CharmAnim
dw SweetKissAnim
dw BulletPunchAnim
dw StruggleAnim
assert_table_length NUM_ATTACKS
dw ShowPicAnim
dw EnemyFlashAnim

2
data/moves/moves.asm
View file

@ -175,7 +175,6 @@ Moves:
move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10
move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20
move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10
move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
move FAIRY_WIND, NO_ADDITIONAL_EFFECT, 40, FAIRY, 100, 30
move DRAININGKISS, DRAIN_HP_EFFECT, 50, FAIRY, 100, 10
move METAL_SOUND, SPECIAL_DOWN2_EFFECT, 0, STEEL, 85, 40
@ -189,4 +188,5 @@ Moves:
move CHARM, ATTACK_DOWN2_EFFECT, 0, FAIRY, 100, 20
move SWEET_KISS, CONFUSION_EFFECT, 0, FAIRY, 75, 10
move BULLET_PUNCH, NO_ADDITIONAL_EFFECT, 40, STEEL, 100, 30
move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
assert_table_length NUM_ATTACKS

2
data/moves/names.asm
View file

@ -164,7 +164,6 @@ MoveNames::
li "SUPER FANG"
li "SLASH"
li "SUBSTITUTE"
li "STRUGGLE"
li "FAIRY WIND"
li "DRAININGKISS"
li "METAL SOUND"
@ -178,4 +177,5 @@ MoveNames::
li "CHARM"
li "SWEET KISS"
li "BULLET PUNCH"
li "STRUGGLE"
assert_list_length NUM_ATTACKS

2
data/moves/sfx.asm
View file

@ -165,7 +165,6 @@ MoveSoundTable:
db SFX_BATTLE_26, $f0, $ff ; SUPER_FANG
db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH
db SFX_BATTLE_2C, $d8, $04 ; SUBSTITUTE
db SFX_BATTLE_0B, $00, $80 ; STRUGGLE
db SFX_BATTLE_12, $00, $c0 ; FAIRY_WIND
db SFX_BATTLE_24, $00, $80 ; DRAININGKISS
db SFX_BATTLE_31, $00, $80 ; METAL_SOUND
@ -179,5 +178,6 @@ MoveSoundTable:
db SFX_BATTLE_09, $88, $10 ; CHARM
db SFX_BATTLE_09, $88, $10 ; SWEET_KISS
db SFX_BATTLE_0B, $01, $80 ; BULLET_PUNCH
db SFX_BATTLE_0B, $00, $80 ; STRUGGLE
assert_table_length NUM_ATTACKS
db SFX_BATTLE_0B, $00, $80