diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-27 16:27:30 -0400 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-27 21:43:32 -0400 |
| commit | d5089d3c623e2b147b035cf12569810d604bf47d (patch) | |
| tree | 9d64a8943a11fef8a2b1afe0c4c8eda29e4ecfe1 /engine/battle | |
| parent | 4b853ad676e061a6c4b0fcc030855a2705776864 (diff) | |
Organize gfx/
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 10 | ||||
| -rw-r--r-- | engine/battle/battle_transitions.asm | 2 | ||||
| -rw-r--r-- | engine/battle/draw_hud_pokeball_gfx.asm | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 9eb7badb..fcc3c99f 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -361,17 +361,17 @@ AnimationTilesetPointers: db $FF AnimationTileset1: - INCBIN "gfx/attack_anim_1.2bpp" + INCBIN "gfx/battle/attack_anim_1.2bpp" AnimationTileset2: - INCBIN "gfx/attack_anim_2.2bpp" + INCBIN "gfx/battle/attack_anim_2.2bpp" SlotMachineTiles2: IF DEF(_RED) - INCBIN "gfx/red/slotmachine2.2bpp" + INCBIN "gfx/slots/red_slots_2.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine2.2bpp" + INCBIN "gfx/slots/blue_slots_2.2bpp" ENDC MoveAnimation: @@ -1710,7 +1710,7 @@ AnimationMinimizeMon: jp AnimationShowMonPic MinimizedMonSprite: - INCBIN "gfx/minimized_mon_sprite.1bpp" + INCBIN "gfx/battle/minimize.1bpp" MinimizedMonSpriteEnd: AnimationSlideMonDownAndHide: diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index f2e26ed5..62b023b0 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -160,7 +160,7 @@ LoadBattleTransitionTile: jp CopyVideoData BattleTransitionTile: - INCBIN "gfx/battle_transition.2bpp" + INCBIN "gfx/overworld/battle_transition.2bpp" BattleTransitionTileEnd: BattleTransition_BlackScreen: diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 323dd167..c0a91949 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -188,5 +188,5 @@ SetupPlayerAndEnemyPokeballs: ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon) PokeballTileGraphics:: - INCBIN "gfx/pokeball.2bpp" + INCBIN "gfx/battle/balls.2bpp" PokeballTileGraphicsEnd: |