diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:44:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 15:44:07 -0400 |
| commit | 30ef49416391d036286661a8e1225b4ba03e3109 (patch) | |
| tree | 449560dd408241717995409d3cb6c0a8e4b5223a /graphics | |
| parent | 60a9dc6a0e81da34f111e66fd3666f9eb57898e9 (diff) | |
| parent | e47b3efdfe8a397e20905d566a8e1b1261170fbb (diff) | |
Merge branch 'master' into doc-inc2
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/trade/menu_mon_box.bin (renamed from graphics/unknown/unknown_DDD704.bin) | bin | 36 -> 36 bytes | |||
| -rw-r--r-- | graphics/trade/pokeball.png (renamed from graphics/trade/ball.png) | bin | 464 -> 464 bytes | |||
| -rw-r--r-- | graphics/trade/unknown_DDB444.pal (renamed from graphics/unknown/unknown_DDB444.pal) | 0 | ||||
| -rw-r--r-- | graphics/trade/unknown_DDCF04.bin (renamed from graphics/unknown/unknown_DDCF04.bin) | bin | 2048 -> 2048 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/graphics/unknown/unknown_DDD704.bin b/graphics/trade/menu_mon_box.bin Binary files differindex 354866137..354866137 100644 --- a/graphics/unknown/unknown_DDD704.bin +++ b/graphics/trade/menu_mon_box.bin diff --git a/graphics/trade/ball.png b/graphics/trade/pokeball.png Binary files differindex 97cc86a6f..97cc86a6f 100644 --- a/graphics/trade/ball.png +++ b/graphics/trade/pokeball.png diff --git a/graphics/unknown/unknown_DDB444.pal b/graphics/trade/unknown_DDB444.pal index bb74b34a2..bb74b34a2 100644 --- a/graphics/unknown/unknown_DDB444.pal +++ b/graphics/trade/unknown_DDB444.pal diff --git a/graphics/unknown/unknown_DDCF04.bin b/graphics/trade/unknown_DDCF04.bin Binary files differindex 46218245f..46218245f 100644 --- a/graphics/unknown/unknown_DDCF04.bin +++ b/graphics/trade/unknown_DDCF04.bin |
