summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authoraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-10-26 12:16:36 -0300
committeraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-10-26 12:16:36 -0300
commit1c3d75f6736445324fdcba31d5dbd858997e22c4 (patch)
treee0a94bdb8c2a3323048c9dc9540fa6b5af004c83 /graphics
parentfe40c0c4663d732c8ba9ca5f5e00b3c14a17d304 (diff)
parent585f313c646cb9494bed48395572daf1502978a5 (diff)
Merge branch 'master' into reverts
Diffstat (limited to 'graphics')
-rw-r--r--graphics/picture_frame/frame5_map.bin.rl.bakbin1296 -> 0 bytes
-rw-r--r--graphics/pokenav/bg_dots.bin (renamed from graphics/pokenav/bg.bin)0
-rw-r--r--graphics/pokenav/bg_dots.png (renamed from graphics/pokenav/bg.png)bin141 -> 141 bytes
-rw-r--r--graphics/pokenav/device_outline.png (renamed from graphics/pokenav/outline.png)bin596 -> 596 bytes
-rw-r--r--graphics/pokenav/device_outline_map.bin (renamed from graphics/pokenav/outline_map.bin)bin1280 -> 1280 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/graphics/picture_frame/frame5_map.bin.rl.bak b/graphics/picture_frame/frame5_map.bin.rl.bak
deleted file mode 100644
index c009f0a95..000000000
--- a/graphics/picture_frame/frame5_map.bin.rl.bak
+++ /dev/null
Binary files differ
diff --git a/graphics/pokenav/bg.bin b/graphics/pokenav/bg_dots.bin
index 7161609bb..7161609bb 100644
--- a/graphics/pokenav/bg.bin
+++ b/graphics/pokenav/bg_dots.bin
diff --git a/graphics/pokenav/bg.png b/graphics/pokenav/bg_dots.png
index 056e2400b..056e2400b 100644
--- a/graphics/pokenav/bg.png
+++ b/graphics/pokenav/bg_dots.png
Binary files differ
diff --git a/graphics/pokenav/outline.png b/graphics/pokenav/device_outline.png
index 5700b272c..5700b272c 100644
--- a/graphics/pokenav/outline.png
+++ b/graphics/pokenav/device_outline.png
Binary files differ
diff --git a/graphics/pokenav/outline_map.bin b/graphics/pokenav/device_outline_map.bin
index 6d70bdcd9..6d70bdcd9 100644
--- a/graphics/pokenav/outline_map.bin
+++ b/graphics/pokenav/device_outline_map.bin
Binary files differ