Revert "April Fools!"

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

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

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

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

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