diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
commit | bb23128b77a01d3c39b11aef978acf437ae71974 (patch) | |
tree | f6de6f5278cc10fba0c7ab159365d3ed16ab6bf9 /graphics | |
parent | 144c5888a11115c93ed065c738a8ab395d71a798 (diff) | |
parent | a081124a20896a0cc2ee4fac2df6d4b5440125ef (diff) |
Merge conflict resolves into review changes
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 |