diff options
Diffstat (limited to 'data/battle_anims')
| -rw-r--r-- | data/battle_anims/ball_colors.asm | 3 | ||||
| -rw-r--r-- | data/battle_anims/framesets.asm | 3 | ||||
| -rw-r--r-- | data/battle_anims/oam.asm | 3 | ||||
| -rw-r--r-- | data/battle_anims/object_gfx.asm | 3 | ||||
| -rw-r--r-- | data/battle_anims/objects.asm | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/data/battle_anims/ball_colors.asm b/data/battle_anims/ball_colors.asm index c3ba9d2b4..0453c14b7 100644 --- a/data/battle_anims/ball_colors.asm +++ b/data/battle_anims/ball_colors.asm @@ -1,6 +1,6 @@ ; colors of balls thrown in battle -BallColors: ; cd26c (33:526c) +BallColors: db MASTER_BALL, PAL_BATTLE_OB_GREEN db ULTRA_BALL, PAL_BATTLE_OB_YELLOW db GREAT_BALL, PAL_BATTLE_OB_BLUE @@ -13,4 +13,3 @@ BallColors: ; cd26c (33:526c) db MOON_BALL, PAL_BATTLE_OB_GRAY db LOVE_BALL, PAL_BATTLE_OB_RED db -1, PAL_BATTLE_OB_GRAY -; cd284 diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index 905597cfa..35cb3e5a8 100644 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm @@ -1,4 +1,4 @@ -BattleAnimFrameData: ; ce85e +BattleAnimFrameData: ; entries correspond to BATTLEANIMFRAMESET_* constants dw .Frameset_00 ; BATTLEANIMFRAMESET_00 dw .Frameset_01 ; BATTLEANIMFRAMESET_01 @@ -1267,4 +1267,3 @@ BattleAnimFrameData: ; ce85e frame BATTLEANIMOAMSET_D7, 8 endanim -; ceeae diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm index d4b0b6978..1beca2937 100644 --- a/data/battle_anims/oam.asm +++ b/data/battle_anims/oam.asm @@ -1,4 +1,4 @@ -BattleAnimOAMData: ; ceeae +BattleAnimOAMData: ; entries correspond to BATTLEANIMOAMSET_* constants ; vtile offset, length, pointer dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00 @@ -1083,4 +1083,3 @@ BattleAnimOAMData: ; ceeae dsprite -2, 0, 6, 4, $00, $0 dsprite -4, 0, 8, 4, $00, $0 dsprite -2, 0, 10, 4, $00, $0 -; cfcf6 diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm index 441692b03..432e513dd 100644 --- a/data/battle_anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm @@ -4,7 +4,7 @@ anim_obj_gfx: MACRO dba \2 ENDM -AnimObjGFX: ; cfcf6 +AnimObjGFX: ; entries correspond to ANIM_GFX_* constants anim_obj_gfx 0, AnimObj00GFX anim_obj_gfx 21, AnimObjHitGFX @@ -48,4 +48,3 @@ AnimObjGFX: ; cfcf6 anim_obj_gfx 24, AnimObjAeroblastGFX anim_obj_gfx 1, NULL anim_obj_gfx 1, NULL -; cfd9e diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index 3d46ae2d7..0cd19ae0d 100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm @@ -16,7 +16,7 @@ battleanimobj: MACRO db \6 ; tile offset ENDM -BattleAnimObjects: ; ccb56 +BattleAnimObjects: ; entries correspond to ANIM_OBJ_* constants battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_00 battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_01 @@ -206,4 +206,3 @@ BattleAnimObjects: ; ccb56 battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYFEETFOLLOW battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_PLAYERHEADFOLLOW battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYHEADFOLLOW -; ccfbe |