diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 12:48:15 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 12:48:15 -0400 |
| commit | 2454296d32b078123ecfc6434e43d0cb20e12c94 (patch) | |
| tree | 7d4b064c87d0d9b96d5f035fa8dab3cd8950fdb3 /engine | |
| parent | 452803af278648b92cc71af2f714b7689737b969 (diff) | |
Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/animations.asm | 38 | ||||
| -rwxr-xr-x | engine/overworld/map_sprites.asm | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 5716ff56..eac523a3 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1901,39 +1901,39 @@ AnimationSubstitute: ldh a, [hWhoseTurn] and a jr z, .playerTurn - ld hl, SlowbroSprite ; facing down sprite + ld hl, MonsterSprite tile 0 ; facing down sprite ld de, wTempPic + $120 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $10 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 1 ld de, wTempPic + $120 + $70 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $20 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 2 ld de, wTempPic + $120 + $10 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $30 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 3 ld de, wTempPic + $120 + $10 + $70 - call CopySlowbroSpriteData + call CopyMonsterSpriteData jr .next .playerTurn - ld hl, SlowbroSprite + $40 ; facing up sprite + ld hl, MonsterSprite tile 4 ; facing up sprite ld de, wTempPic + $120 + $70 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $50 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 5 ld de, wTempPic + $120 + $e0 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $60 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 6 ld de, wTempPic + $120 + $80 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $70 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 7 ld de, wTempPic + $120 + $f0 - call CopySlowbroSpriteData + call CopyMonsterSpriteData .next call CopyTempPicToMonPic jp AnimationShowMonPic -CopySlowbroSpriteData: - ld bc, $10 - ld a, BANK(SlowbroSprite) +CopyMonsterSpriteData: + ld bc, 1 tiles + ld a, BANK(MonsterSprite) jp FarCopyData2 HideSubstituteShowMonAnim: diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 8f1f3931..031ddc76 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -98,7 +98,7 @@ LoadMapSpriteTilePatterns: push af ld a, [hl] ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] ld b, a ; b = current sprite picture ID - cp SPRITE_BALL ; is it a 4-tile sprite? + cp FIRST_STILL_SPRITE ; is it a 4-tile sprite? jr c, .notFourTileSprite pop af ldh a, [hFourTileSpriteCount] |