diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-27 18:02:08 -0400 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-27 21:43:32 -0400 |
| commit | 209ecc1919f561e4a0a5a79fb1fbb4956c3338ba (patch) | |
| tree | 72a64c2502790da0cc8584445d0ee5860ca3521c /main.asm | |
| parent | 77df64ba9c5dff5dcafad6545eefa6cd614c66b3 (diff) | |
Merge pic/ into gfx/
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -6,8 +6,8 @@ SECTION "bank1", ROMX INCLUDE "data/facing.asm" INCLUDE "engine/black_out.asm" -MewPicFront:: INCBIN "pic/bmon/mew.pic" -MewPicBack:: INCBIN "pic/monback/mewb.pic" +MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" +MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" INCLUDE "data/baseStats/mew.asm" INCLUDE "engine/battle/safari_zone.asm" @@ -109,9 +109,9 @@ INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" INCLUDE "engine/menu/party_menu.asm" -RedPicFront:: INCBIN "pic/trainer/red.pic" -ShrinkPic1:: INCBIN "pic/trainer/shrink1.pic" -ShrinkPic2:: INCBIN "pic/trainer/shrink2.pic" +RedPicFront:: INCBIN "gfx/player/red.pic" +ShrinkPic1:: INCBIN "gfx/player/shrink1.pic" +ShrinkPic2:: INCBIN "gfx/player/shrink2.pic" INCLUDE "engine/turn_sprite.asm" INCLUDE "engine/menu/start_sub_menus.asm" |