diff options
| author | dannye <33dannye@gmail.com> | 2020-11-14 21:46:05 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-14 21:54:23 -0600 |
| commit | 48dc6a8cf4da512273e79e49346b35dcc225f773 (patch) | |
| tree | 52ca406cccaf728156d4d0f43d77b93ba0d75da4 /data/pikachu | |
| parent | b88572fbccecc8d125fe8a50365751f0530d1a9a (diff) | |
| parent | 66377fca32c63ca9e362d2d2ce15f0692260ce53 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/pikachu')
| -rw-r--r--[-rwxr-xr-x] | data/pikachu/pikachu_emotions.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pikachu/pikachu_pic_animation.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pikachu/pikachu_pic_objects.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pikachu/pikachu_pic_tilemaps.asm | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/data/pikachu/pikachu_emotions.asm b/data/pikachu/pikachu_emotions.asm index f72beaa4..f72beaa4 100755..100644 --- a/data/pikachu/pikachu_emotions.asm +++ b/data/pikachu/pikachu_emotions.asm diff --git a/data/pikachu/pikachu_pic_animation.asm b/data/pikachu/pikachu_pic_animation.asm index a9e3c5e7..a9e3c5e7 100755..100644 --- a/data/pikachu/pikachu_pic_animation.asm +++ b/data/pikachu/pikachu_pic_animation.asm diff --git a/data/pikachu/pikachu_pic_objects.asm b/data/pikachu/pikachu_pic_objects.asm index c3a44bc9..c3a44bc9 100755..100644 --- a/data/pikachu/pikachu_pic_objects.asm +++ b/data/pikachu/pikachu_pic_objects.asm diff --git a/data/pikachu/pikachu_pic_tilemaps.asm b/data/pikachu/pikachu_pic_tilemaps.asm index d11ba04e..d11ba04e 100755..100644 --- a/data/pikachu/pikachu_pic_tilemaps.asm +++ b/data/pikachu/pikachu_pic_tilemaps.asm |