diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-16 04:22:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 04:22:34 -0400 |
| commit | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (patch) | |
| tree | 156f18275a5187ae20fc5f5c3a72d61635f126ec /graphics | |
| parent | 20fa13616f3ad2ec2f7d68668b9f386355a10fa7 (diff) | |
| parent | 60a592a2c32d07d47c892204659a8576017584d1 (diff) | |
Merge branch 'master' into document-gyms2
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 |
