Skip to content

Commit

Permalink
Updated Spore's Animation
Browse files Browse the repository at this point in the history
  • Loading branch information
@SoupPotato
SoupPotato committed Jan 21, 2024
1 parent 59962c3 commit ae76ce2
Show file tree
Hide file tree
Showing 10 changed files with 443 additions and 402 deletions.
399 changes: 203 additions & 196 deletions constants/battle_anim_constants.asm
View file

Large diffs are not rendered by default.

375 changes: 192 additions & 183 deletions data/battle_anims/framesets.asm
View file

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions data/battle_anims/oam.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ BattleAnimOAMData:
battleanimoam $07, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_D8
battleanimoam $00, 9, .OAMData_d9 ; BATTLE_ANIM_OAMSET_D9
battleanimoam $06, 9, .OAMData_da ; BATTLE_ANIM_OAMSET_DA
battleanimoam $00, 9, .OAMData_db ; BATTLE_ANIM_OAMSET_DB
battleanimoam $06, 9, .OAMData_db ; BATTLE_ANIM_OAMSET_DC
battleanimoam $0c, 9, .OAMData_db ; BATTLE_ANIM_OAMSET_DD
assert_table_length NUM_BATTLE_ANIM_OAMSETS

.OAMData_11:
Expand Down Expand Up @@ -1115,3 +1118,16 @@ BattleAnimOAMData:
dbsprite -2, 0, 4, 4, $00, Y_FLIP
dbsprite -1, 0, 4, 4, $01, Y_FLIP
dbsprite 0, 0, 4, 4, $02, Y_FLIP

.OAMData_db:
dbsprite -2, -2, 4, 4, $00, $0
dbsprite -1, -2, 4, 4, $01, $0
dbsprite 0, -2, 4, 4, $00, X_FLIP
dbsprite -2, -1, 4, 4, $02, $0
dbsprite -1, -1, 4, 4, $03, $0
dbsprite 0, -1, 4, 4, $02, X_FLIP
dbsprite -2, 0, 4, 4, $04, $0
dbsprite -1, 0, 4, 4, $05, $0
dbsprite 0, 0, 4, 4, $04, X_FLIP


1 change: 1 addition & 0 deletions data/battle_anims/object_gfx.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ AnimObjGFX:
anim_obj_gfx 10, AnimObjBeamLightGFX
anim_obj_gfx 9, AnimObjSmokePuffGFX
anim_obj_gfx 12, AnimObjTriangleGFX
anim_obj_gfx 18, AnimObjMushroomGFX
anim_obj_gfx 1, NULL
anim_obj_gfx 1, NULL
assert_table_length NUM_BATTLE_ANIM_GFX + 1
8 changes: 6 additions & 2 deletions data/battle_anims/objects.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ BattleAnimObjects:
battleanimobj RELATIVE_X, $88, BATTLE_ANIM_FRAMESET_ACID, BATTLE_ANIM_FUNC_THROW_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_POISON
; BATTLE_ANIM_OBJ_SLUDGE
battleanimobj RELATIVE_X, $b4, BATTLE_ANIM_FRAMESET_SLUDGE_BUBBLE, BATTLE_ANIM_FUNC_SLUDGE, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_POISON
; BATTLE_ANIM_OBJ_BETA_BALL_POOF
battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_BALL_POOF, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_SMOKE
; BATTLE_ANIM_OBJ_BALL_POOF_YFIX
battleanimobj RELATIVE_X, $80, BATTLE_ANIM_FRAMESET_BALL_POOF, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_SMOKE
; BATTLE_ANIM_OBJ_BALL_POOF
battleanimobj RELATIVE_X, $a0, BATTLE_ANIM_FRAMESET_BALL_POOF, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_SMOKE
; BATTLE_ANIM_OBJ_BIG_ROCK
Expand Down Expand Up @@ -419,4 +419,8 @@ BattleAnimObjects:
battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_SPINNING_TRIANGLE_SLOW, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_TRIANGLE
; BATTLE_ANIM_OBJ_POISON_DROPLET
battleanimobj RELATIVE_X, $6e, BATTLE_ANIM_FRAMESET_POISON_DROPLET, BATTLE_ANIM_FUNC_RADIAL_MOVE_OUT_SLOW, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_POISON
; BATTLE_ANIM_OBJ_MUSHROOM
battleanimobj RELATIVE_X, $80, BATTLE_ANIM_FRAMESET_BOUNCING_MUSHROOM, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_RED, BATTLE_ANIM_GFX_MUSHROOM
; BATTLE_ANIM_OBJ_POWDER_SHOOT
battleanimobj RELATIVE_X, $80, BATTLE_ANIM_FRAMESET_POWDER, BATTLE_ANIM_FUNC_RADIAL_MOVE_OUT_SLOW, PAL_BATTLE_OB_YELLOW, BATTLE_ANIM_GFX_POWDER
assert_table_length NUM_BATTLE_ANIM_OBJS
42 changes: 22 additions & 20 deletions data/moves/animations.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,17 +428,13 @@ BattleAnim_ThrowBait:
anim_ret

BattleAnim_SendOutMon:
anim_if_param_equal $0, .Normal
anim_if_param_equal $1, .Shiny
anim_1gfx BATTLE_ANIM_GFX_SMOKE
anim_call BattleAnim_TargetObj_1Row
anim_bgeffect BATTLE_BG_EFFECT_BETA_SEND_OUT_MON2, $0, BG_EFFECT_USER, $0
anim_sound 0, 0, SFX_BALL_POOF
anim_obj BATTLE_ANIM_OBJ_BETA_BALL_POOF, 48, 96, $0
anim_bgeffect BATTLE_BG_EFFECT_ENTER_MON, $0, BG_EFFECT_USER, $0
anim_wait 128
anim_obj BATTLE_ANIM_OBJ_BALL_POOF, 44, 96, $0
anim_wait 4
anim_call BattleAnim_ShowMon_0
anim_bgeffect BATTLE_BG_EFFECT_ENTER_MON, $0, BG_EFFECT_USER, $0
anim_wait 32
anim_ret

.Shiny:
Expand Down Expand Up @@ -471,15 +467,6 @@ BattleAnim_SendOutMon:
anim_wait 32
anim_ret

.Normal:
anim_1gfx BATTLE_ANIM_GFX_SMOKE
anim_sound 0, 0, SFX_BALL_POOF
anim_obj BATTLE_ANIM_OBJ_BALL_POOF, 44, 96, $0
anim_wait 4
anim_bgeffect BATTLE_BG_EFFECT_ENTER_MON, $0, BG_EFFECT_USER, $0
anim_wait 32
anim_ret

BattleAnim_ReturnMon:
anim_sound 0, 0, SFX_BALL_POOF
BattleAnimSub_Return:
Expand Down Expand Up @@ -1481,10 +1468,6 @@ BattleAnim_Poisonpowder:
BattleAnim_SleepPowder:
anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_GREEN
anim_jump BattleAnim_StunSpore
BattleAnim_Spore:
anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_SPORE
anim_bgeffect BATTLE_BG_EFFECT_ALTERNATE_HUES, $0, $2, $0
anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0
BattleAnim_StunSpore:
anim_1gfx BATTLE_ANIM_GFX_POWDER
.loop
Expand All @@ -1507,6 +1490,25 @@ BattleAnim_StunSpore:
anim_wait 96
anim_ret

BattleAnim_Spore:
anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_SPORE
anim_setobjpal PAL_BATTLE_OB_RED, PAL_BTLCUSTOM_DRAGONBREATH
anim_3gfx BATTLE_ANIM_GFX_MUSHROOM, BATTLE_ANIM_GFX_POWDER, BATTLE_ANIM_GFX_SMOKE
anim_sound 0, 1, SFX_JUMP_OVER_LEDGE
anim_obj BATTLE_ANIM_OBJ_BALL_POOF_YFIX, 48, 88, $0
anim_wait 12
anim_obj BATTLE_ANIM_OBJ_MUSHROOM, 48, 88, $0
anim_wait 32
anim_sound 0, 1, SFX_SWEET_SCENT_2
anim_obj BATTLE_ANIM_OBJ_POWDER_SHOOT, 48, 88, $35
anim_obj BATTLE_ANIM_OBJ_POWDER_SHOOT, 48, 88, $2b
anim_obj BATTLE_ANIM_OBJ_POWDER_SHOOT, 48, 88, $39
anim_obj BATTLE_ANIM_OBJ_POWDER_SHOOT, 48, 88, $27
anim_bgeffect BATTLE_BG_EFFECT_ALTERNATE_HUES, $0, $2, $0
anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0
anim_wait 16
anim_jump BattleAnim_StunSpore.loop

BattleAnim_HyperBeam:
anim_1gfx BATTLE_ANIM_GFX_BEAM
anim_bgeffect BATTLE_BG_EFFECT_SHAKE_SCREEN_X, $30, $4, $10
Expand Down
2 changes: 1 addition & 1 deletion engine/battle_anims/functions.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4236,7 +4236,7 @@ Step_Slow:
call Get_Rad_Pos
ld hl, 1.5 ; speed
call Set_Rad_Pos
cp 120 ; final position
cp 40 ; final position
jmp nc, DeinitBattleAnimation
jr Rad_Move

Expand Down
1 change: 1 addition & 0 deletions gfx/battle_anims.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ AnimObjAeroblastGFX: INCBIN "gfx/battle_anims/aeroblast.2bpp.lz"
AnimObjBeamLightGFX: INCBIN "gfx/battle_anims/beamlight.2bpp.lz"
AnimObjSmokePuffGFX: INCBIN "gfx/battle_anims/smokepuff.2bpp.lz"
AnimObjTriangleGFX: INCBIN "gfx/battle_anims/triangle.2bpp.lz"
AnimObjMushroomGFX: INCBIN "gfx/battle_anims/mushroom.2bpp.lz"
1 change: 1 addition & 0 deletions gfx/battle_anims/custom.pal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,6 @@ INCLUDE "gfx/battle_anims/battle_anims.pal"
RGB 31, 31, 07
RGB 31, 23, 04
RGB 31, 16, 01

rept NUM_CUSTOM_BATTLE_PALETTES - 6
endr
Binary file added gfx/battle_anims/mushroom.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ae76ce2

Please sign in to comment.