diff options
| author | BlueZangoose <113498143+BlueZangoose@users.noreply.github.com> | 2022-09-25 19:17:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-25 14:17:39 -0400 |
| commit | 0f5a9eb1465c76426034a68caa2ff350d29716e0 (patch) | |
| tree | 73b947d740868c50a99d3a86259415a605e35d39 /engine/battle | |
| parent | Use a SPRITE_SET_LENGTH constant (diff) | |
| download | pokeyellow-0f5a9eb1465c76426034a68caa2ff350d29716e0.tar.gz pokeyellow-0f5a9eb1465c76426034a68caa2ff350d29716e0.tar.xz pokeyellow-0f5a9eb1465c76426034a68caa2ff350d29716e0.zip | |
Change names of move subanimations to be meaningful (#389)
Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/animations.asm | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 789dcb8a..fcfec14d 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -249,7 +249,7 @@ PlayAnimation: push af ld a, [wAnimPalette] ldh [rOBP0], a - call LoadAnimationTileset + call LoadMoveAnimationTiles vc_hook Reduce_move_anim_flashing_Mega_Punch_Self_Destruct_Explosion call LoadSubanimation call PlaySubanimation @@ -352,11 +352,11 @@ GetSubanimationTransform2: ret ; loads tile patterns for battle animations -LoadAnimationTileset: +LoadMoveAnimationTiles: ld a, [wWhichBattleAnimTileset] add a add a - ld hl, AnimationTilesetPointers + ld hl, MoveAnimationTilesPointers ld e, a ld d, 0 add hl, de @@ -367,7 +367,7 @@ LoadAnimationTileset: ld a, [hl] ld d, a ; de = address of tileset ld hl, vSprites tile $31 - ld b, BANK(AnimationTileset1) ; ROM bank + ld b, BANK(MoveAnimationTiles0) ; ROM bank ld a, [wTempTilesetNumTiles] ld c, a ; number of tiles jp CopyVideoData ; load tileset @@ -378,17 +378,18 @@ MACRO anim_tileset db -1 ; padding ENDM -AnimationTilesetPointers: +MoveAnimationTilesPointers: ; number of tiles, gfx pointer - anim_tileset 79, AnimationTileset1 - anim_tileset 79, AnimationTileset2 - anim_tileset 64, AnimationTileset1 + anim_tileset 79, MoveAnimationTiles0 + anim_tileset 79, MoveAnimationTiles1 + anim_tileset 64, MoveAnimationTiles2 -AnimationTileset1: - INCBIN "gfx/battle/attack_anim_1.2bpp" +MoveAnimationTiles0: +MoveAnimationTiles2: + INCBIN "gfx/battle/move_anim_0.2bpp" -AnimationTileset2: - INCBIN "gfx/battle/attack_anim_2.2bpp" +MoveAnimationTiles1: + INCBIN "gfx/battle/move_anim_1.2bpp" SlotMachineTiles2: IF DEF(_RED) @@ -1114,7 +1115,7 @@ AnimationWaterDropletsEverywhere: ; in Surf/Mist/Toxic. xor a ld [wWhichBattleAnimTileset], a - call LoadAnimationTileset + call LoadMoveAnimationTiles ld d, 32 ld a, -16 ld [wBaseCoordX], a @@ -1634,7 +1635,7 @@ _AnimationShootBallsUpward: push bc xor a ld [wWhichBattleAnimTileset], a - call LoadAnimationTileset + call LoadMoveAnimationTiles pop bc ld d, $7a ; ball tile ld hl, wShadowOAM @@ -2074,7 +2075,7 @@ InitMultipleObjectsOAM: push bc push de ld [wWhichBattleAnimTileset], a - call LoadAnimationTileset + call LoadMoveAnimationTiles pop de pop bc xor a |