thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-02-29 08:54:28 +13:00
parent 63376f1e9e dd5f64ad06
commit 6c98d7dba8
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/moves/moves.asm
View file

@ -193,7 +193,7 @@ Moves:
move FAKE_TEARS, SPECIAL_DOWN2_EFFECT, 0, DARK, 100, 20 move FAKE_TEARS, SPECIAL_DOWN2_EFFECT, 0, DARK, 100, 20
move FALSE_SURRENDER, SWIFT_EFFECT, 80, DARK, 100, 10 ; figure out the actual name another time move FALSE_SURRENDER, SWIFT_EFFECT, 80, DARK, 100, 10 ; figure out the actual name another time
move KOWTOW_CLEAVE, SWIFT_EFFECT, 85, DARK, 100, 10 move KOWTOW_CLEAVE, SWIFT_EFFECT, 85, DARK, 100, 10
move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10 move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 15
move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10
move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15 move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15
move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25 move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25

19
scripts/OaksLab.asm
View file

@ -856,6 +856,25 @@ OaksLab_TextPointers2:
dw OaksLabText9 dw OaksLabText9
dw OaksLabText10 dw OaksLabText10
dw OaksLabText11 dw OaksLabText11
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText ;placeholder
dw OakLabEmailText
OaksLabText1: OaksLabText1:
text_asm text_asm

1
text/FightingDojo.asm
View file

@ -153,3 +153,4 @@ _KoichiRematchDefeatedText::
text "I have" text "I have"
line "been defeated" line "been defeated"
cont "once more..." cont "once more..."
done