diff options
Diffstat (limited to 'battle/objects/data.asm')
| -rwxr-xr-x | battle/objects/data.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/battle/objects/data.asm b/battle/objects/data.asm index 8a3f42f85..fa5dff269 100755 --- a/battle/objects/data.asm +++ b/battle/objects/data.asm @@ -57,22 +57,22 @@ endm ; ANIM_OBJ_BURNED battleanimobj $01, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, $04, $03 -; ANIM_OBJ_11 +; ANIM_OBJ_BLIZZARD battleanimobj $01, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, $06, $0a ; ANIM_OBJ_12 battleanimobj $01, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, $06, $0a -; ANIM_OBJ_13 +; ANIM_OBJ_ICE_BEAM battleanimobj $01, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, $06, $0a -; ANIM_OBJ_14 - battleanimobj $21, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_0B, $05, $06 +; ANIM_OBJ_RAZOR_LEAF + battleanimobj $21, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_RAZOR_LEAF, $05, $06 ; ANIM_OBJ_POKE_BALL battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, $04, $0b -; ANIM_OBJ_16 +; ANIM_OBJ_POKE_BALL_BLOCKED battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, $04, $0b ; ANIM_OBJ_17 @@ -90,7 +90,7 @@ endm ; ANIM_OBJ_1B battleanimobj $01, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07 -; ANIM_OBJ_1C +; ANIM_OBJ_BALL_POOF battleanimobj $01, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1D @@ -105,7 +105,7 @@ endm ; ANIM_OBJ_20 battleanimobj $01, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, $06, $21 -; ANIM_OBJ_21 +; ANIM_OBJ_BUBBLE battleanimobj $01, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, $06, $0d ; ANIM_OBJ_22 @@ -129,13 +129,13 @@ endm ; ANIM_OBJ_28 battleanimobj $61, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, $03, $10 -; ANIM_OBJ_29 +; ANIM_OBJ_ICE_BUILDUP battleanimobj $01, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_FROZEN battleanimobj $01, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, $06, $0a -; ANIM_OBJ_2B +; ANIM_OBJ_MASTER_BALL_SPARKLE battleanimobj $01, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, $07, $11 ; ANIM_OBJ_2C @@ -213,7 +213,7 @@ endm ; ANIM_OBJ_44 battleanimobj $21, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, $03, $11 -; ANIM_OBJ_45 +; ANIM_OBJ_ABSORB battleanimobj $01, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, $05, $12 ; ANIM_OBJ_46 @@ -228,8 +228,8 @@ endm ; ANIM_OBJ_49 battleanimobj $21, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, $05, $16 -; ANIM_OBJ_4A - battleanimobj $21, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_20, $05, $06 +; ANIM_OBJ_LEECH_SEED + battleanimobj $21, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, $05, $06 ; ANIM_OBJ_4B battleanimobj $21, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, $02, $0e @@ -279,20 +279,20 @@ endm ; ANIM_OBJ_5A battleanimobj $21, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, $02, $1b -; ANIM_OBJ_5B - battleanimobj $00, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_29, $02, $1c +; ANIM_OBJ_HAZE + battleanimobj $00, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1c -; ANIM_OBJ_5C - battleanimobj $21, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_29, $02, $1c +; ANIM_OBJ_MIST + battleanimobj $21, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1c -; ANIM_OBJ_5D - battleanimobj $21, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_29, $02, $1c +; ANIM_OBJ_SMOG + battleanimobj $21, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1c -; ANIM_OBJ_5E - battleanimobj $21, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_2A, $02, $1c +; ANIM_OBJ_POISON_GAS + battleanimobj $21, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_POISON_GAS, $02, $1c -; ANIM_OBJ_5F - battleanimobj $61, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_2B, $02, $1d +; ANIM_OBJ_HORN + battleanimobj $61, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_HORN, $02, $1d ; ANIM_OBJ_60 battleanimobj $61, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, $02, $1d @@ -313,7 +313,7 @@ endm battleanimobj $01, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, $02, $11 ; ANIM_OBJ_66 - battleanimobj $01, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_2A, $04, $23 + battleanimobj $01, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_POISON_GAS, $04, $23 ; ANIM_OBJ_67 battleanimobj $01, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, $02, $1f @@ -342,7 +342,7 @@ endm ; ANIM_OBJ_LICK battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04 -; ANIM_OBJ_70 +; ANIM_OBJ_WITHDRAW battleanimobj $21, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_71 @@ -393,8 +393,8 @@ endm ; ANIM_OBJ_80 battleanimobj $01, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, $04, $03 -; ANIM_OBJ_81 - battleanimobj $21, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_29, $02, $1f +; ANIM_OBJ_COTTON_SPORE + battleanimobj $21, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1f ; ANIM_OBJ_82 battleanimobj $21, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, $02, $1f |