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

Revert "April Fools!"

Browse source 
This reverts commit 44304c57fc.
This commit is contained in:
Martha Schilling 2024-04-01 10:54:56 +01:00
parent 44304c57fc
commit 2d24f19ba6
26 changed files with 20 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

11
data/moves/animations.asm
View file

@ -186,7 +186,6 @@ AttackAnimationPointers:
dw NastyPlotAnim
dw UppercutAnim
dw PowderSnowAnim
dw EggTossAnim
dw StruggleAnim
assert_table_length NUM_ATTACKS
dw ShowPicAnim
@ -1379,16 +1378,6 @@ KowtowCleaveAnim:
DisarmingVoiceAnim:
battle_anim DISARMING_VOICE, SUBANIM_0_HEART_1_MUSIC, 1, 6
db -1 ; end
EggTossAnim:
battle_anim DEFENSE_CURL, SE_SLIDE_MON_DOWN
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
battle_anim NO_MOVE, SE_SHOW_MON_PIC
battle_anim BARRAGE, SUBANIM_1_CIRCLE_BLACK_TOSS, 1, 4
battle_anim DOUBLESLAP, SUBANIM_1_STAR_BIG_MOVING, 1, 6
battle_anim AMNESIA, SE_SLIDE_ENEMY_MON_OFF
battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC
db -1 ; end
BallTossAnim:
battle_anim NO_MOVE, SUBANIM_0_BALL_TOSS_HIGH, 0, 3

1
data/moves/moves.asm
View file

@ -197,6 +197,5 @@ Moves:
move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10
move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15
move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25
move EGG_TOSS, NO_ADDITIONAL_EFFECT, 90, DRAGON, 95, 10
move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
assert_table_length NUM_ATTACKS

1
data/moves/names.asm
View file

@ -186,6 +186,5 @@ MoveNames:: ; 12chr limit
li "NASTY PLOT"
li "UPPERCUT"
li "POWDER SNOW"
li "EGG TOSS"
li "STRUGGLE"
assert_list_length NUM_ATTACKS

1
data/moves/sfx.asm
View file

@ -187,7 +187,6 @@ MoveSoundTable:
db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT
db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT
db SFX_BATTLE_28, $40, $80 ; POWDER_SNOW
db SFX_BATTLE_34, $00, $40 ; EGG_TOSS
db SFX_BATTLE_0B, $00, $80 ; STRUGGLE
assert_table_length NUM_ATTACKS

1
data/pokemon/base_stats.asm
View file

@ -251,5 +251,4 @@ INCLUDE "data/pokemon/base_stats/mewtwo.asm"
INCLUDE "data/pokemon/base_stats/mew.asm"
INCLUDE "data/pokemon/base_stats/meltan.asm"
INCLUDE "data/pokemon/base_stats/melmetal.asm"
INCLUDE "data/pokemon/base_stats/yoshi.asm"
assert_table_length NUM_POKEMON

26
data/pokemon/base_stats/yoshi.asm
View file

@ -1,26 +0,0 @@
db DEX_YOSHI ; pokedex id
db 91, 134, 95, 80, 100
; hp atk def spd spc
db DRAGON, NORMAL ; type
db 9 ; catch rate
db 218 ; base exp
INCBIN "gfx/pokemon/front/yoshi.pic", 0, 1 ; sprite dimensions
dw YoshiPicFront, YoshiPicBack
db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \
DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \
MIMIC, DOUBLE_TEAM, REFLECT, BIDE, EGG_BOMB, \
FIRE_BLAST, SWIFT, SKULL_BASH, SOFTBOILED, REST, \
THUNDER_WAVE, SUBSTITUTE, SURF, STRENGTH
; end
db BANK(YoshiPicFront)
assert BANK(YoshiPicFront) == BANK(YoshiPicBack)

9
data/pokemon/dex_entries.asm
View file

@ -252,7 +252,7 @@ PokedexEntryPointers:
dw TaurosPBDexEntry
dw GorillaimoDexEntry
dw MissingNoDexEntry
dw YoshiDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
assert_table_length NUM_POKEMON_INDEXES
@ -2024,11 +2024,4 @@ GorillaimoDexEntry:
dw 4080
text_far _GorillaimoDexEntry
text_end
YoshiDexEntry:
db "DINOSAUR@"
db 5,11
dw 1990
text_far _YoshiDexEntry
text_end

2
data/pokemon/dex_order.asm
View file

@ -252,6 +252,6 @@ PokedexOrder:
db DEX_TAUROS_PB
db DEX_GORILLAIMO
db 0 ; MISSINGNO.
db DEX_YOSHI
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
assert_table_length NUM_POKEMON_INDEXES

9
data/pokemon/evos_moves.asm
View file

@ -1121,7 +1121,6 @@ VenonatEvosMoves:
DragoniteEvosMoves:
; Evolutions
db EV_ITEM, FIRE_STONE, 1, YOSHI
db 0
; Learnset
db 10, THUNDER_WAVE
@ -3496,14 +3495,6 @@ FossilAerodactylEvosMoves:
; Evolutions
db 0
; Learnset
db 10, THUNDER_WAVE
db 20, AGILITY
db 35, SLAM
db 45, DRAGON_RAGE
db 55, EGG_BOMB
db 60, HYPER_BEAM
db 65, THUNDER
db 75, EGG_TOSS
db 0
MonGhostEvosMoves:

1
data/pokemon/menu_icons.asm
View file

@ -251,5 +251,4 @@ MonPartyData:
nybble ICON_CAT ; Mew
nybble ICON_BALL ; Meltan
nybble ICON_BALL ; Melmetal
nybble ICON_MON ; Yoshi
end_nybble_array NUM_POKEMON

2
data/pokemon/names.asm
View file

@ -252,7 +252,7 @@ MonsterNames::
db "TAUROS@@@@" ; Paldean, Blaze
db "GORILLAIMO"
db "MISSINGNO."
db "YOSHI@@@@@"
db "MISSINGNO."
db "MISSINGNO."
assert_table_length NUM_POKEMON_INDEXES

10
data/pokemon/new_dex_text.asm
View file

@ -998,16 +998,6 @@ _GorillaimoDexEntry::
next "battling GAWARHED"
dex
_YoshiDexEntry::
text "This rare species"
next "is known for its"
next "long tongue and"
page "playful demeanor."
next "You can even ride"
next "on its back"
dex
_MissingNoDexEntry:: ; unused
text "This is a newly"
next "discovered"

1
data/pokemon/palettes.asm
View file

@ -252,5 +252,4 @@ MonsterPalettes:
db PAL_MEWMON ; MEW
db PAL_YELLOWMON ; MELTAN
db PAL_YELLOWMON ; MELMETAL
db PAL_GREENMON ; YOSHI
assert_table_length NUM_POKEMON + 1