diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:21 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:21 -0500 |
| commit | 599e6e8d16571235f2054aa38f39e66181da3796 (patch) | |
| tree | 9d3670e3329a17f076ea95fc721fd7501354a984 /battle/objects | |
| parent | e044b8ec08fee4a5d4f9cd942551ff94f2577b76 (diff) | |
Battle animation annotations
Diffstat (limited to 'battle/objects')
| -rwxr-xr-x | battle/objects/data.asm | 10 | ||||
| -rwxr-xr-x | battle/objects/gfx_headers.asm | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/battle/objects/data.asm b/battle/objects/data.asm index 7ae0dc371..8a3f42f85 100755 --- a/battle/objects/data.asm +++ b/battle/objects/data.asm @@ -156,7 +156,7 @@ endm ; ANIM_OBJ_31 battleanimobj $21, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, $03, $05 -; ANIM_OBJ_32 +; ANIM_OBJ_LIGHTNING_BOLT battleanimobj $21, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_33 @@ -336,10 +336,10 @@ endm ; ANIM_OBJ_6D battleanimobj $01, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, $03, $11 -; ANIM_OBJ_6E +; ANIM_OBJ_SKY_ATTACK_FEAROW battleanimobj $21, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, $02, $20 -; ANIM_OBJ_6F +; ANIM_OBJ_LICK battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04 ; ANIM_OBJ_70 @@ -432,7 +432,7 @@ endm ; ANIM_OBJ_8D battleanimobj $21, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, $04, $19 -; ANIM_OBJ_8E +; ANIM_OBJ_SPIKES battleanimobj $21, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, $02, $1f ; ANIM_OBJ_8F @@ -504,7 +504,7 @@ endm ; ANIM_OBJ_A5 battleanimobj $61, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, $02, $23 -; ANIM_OBJ_A6 +; ANIM_OBJ_PERISH_SONG battleanimobj $00, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, $02, $0e ; ANIM_OBJ_A7 diff --git a/battle/objects/gfx_headers.asm b/battle/objects/gfx_headers.asm index bec34ce74..eadd1abfb 100755 --- a/battle/objects/gfx_headers.asm +++ b/battle/objects/gfx_headers.asm @@ -8,11 +8,11 @@ object_gfx: MACRO ENDM object_gfx 0, AnimObj00GFX - object_gfx 21, AnimObj01GFX - object_gfx 6, AnimObj02GFX - object_gfx 6, AnimObj03GFX - object_gfx 20, AnimObj04GFX - object_gfx 26, AnimObj05GFX + object_gfx 21, AnimObjHitGFX + object_gfx 6, AnimObjCutGFX + object_gfx 6, AnimObjFireGFX + object_gfx 20, AnimObjWaterGFX + object_gfx 26, AnimObjLightningGFX object_gfx 18, AnimObj06GFX object_gfx 12, AnimObj07GFX object_gfx 9, AnimObj08GFX |