diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /gfx/pokemon/phanpy | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'gfx/pokemon/phanpy')
| -rw-r--r-- | gfx/pokemon/phanpy/anim.asm | 1 | ||||
| -rw-r--r-- | gfx/pokemon/phanpy/anim_idle.asm | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gfx/pokemon/phanpy/anim.asm b/gfx/pokemon/phanpy/anim.asm index 7ec513762..5504c8881 100644 --- a/gfx/pokemon/phanpy/anim.asm +++ b/gfx/pokemon/phanpy/anim.asm @@ -5,4 +5,3 @@ frame 3, 05 dorepeat 3 endanim -; 0xd157e diff --git a/gfx/pokemon/phanpy/anim_idle.asm b/gfx/pokemon/phanpy/anim_idle.asm index 43148da49..8318520e3 100644 --- a/gfx/pokemon/phanpy/anim_idle.asm +++ b/gfx/pokemon/phanpy/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2160 |