diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-05 23:50:03 -0500 |
commit | d3f13528754b985e892385dbd88c3c9a95681f1b (patch) | |
tree | 4a18885606996ff59bb714afb5db9a548e2f94a7 /gfx | |
parent | abaf9fee7c73e708ef8c3e7a1ed710bfc9ec6f6e (diff) | |
parent | e16dec874a239c162680b169391d3c0c7ee1fc70 (diff) |
Merge pull request #301 from Rangi42/master
Sync home and macro code with pokeyellow
Diffstat (limited to 'gfx')
-rw-r--r-- | gfx/battle/oldmanb.png (renamed from gfx/battle/oldman.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | gfx/pics.asm | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gfx/battle/oldman.png b/gfx/battle/oldmanb.png Binary files differindex 6d48000f..6d48000f 100644 --- a/gfx/battle/oldman.png +++ b/gfx/battle/oldmanb.png diff --git a/gfx/pics.asm b/gfx/pics.asm index 0e2adc24..94286c9a 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -264,7 +264,7 @@ StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" RedPicBack:: INCBIN "gfx/player/redb.pic" -OldManPic:: INCBIN "gfx/battle/oldman.pic" +OldManPicBack:: INCBIN "gfx/battle/oldmanb.pic" SECTION "Pics 5", ROMX |