From 20a9d8f3ef6a0b5be2be245fdc7632b6613b4450 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sun, 7 Jul 2019 01:44:46 +0800
Subject: renamed some graphics

---
 data/graphics.s                                      |   6 +++---
 graphics/interface/dex_caught_pokeball.pal           |  19 +++++++++++++++++++
 .../dex_caught_pokeball_and_pokemon_types.png        | Bin 0 -> 1803 bytes
 graphics/interface/menu.png                          | Bin 1803 -> 0 bytes
 graphics/interface/menu1.pal                         |  19 -------------------
 graphics/interface/menu2.pal                         |  19 -------------------
 graphics/interface/pokemon_types.pal                 |  19 +++++++++++++++++++
 7 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 graphics/interface/dex_caught_pokeball.pal
 create mode 100644 graphics/interface/dex_caught_pokeball_and_pokemon_types.png
 delete mode 100644 graphics/interface/menu.png
 delete mode 100644 graphics/interface/menu1.pal
 delete mode 100644 graphics/interface/menu2.pal
 create mode 100644 graphics/interface/pokemon_types.pal

diff --git a/data/graphics.s b/data/graphics.s
index a8018aaf3..83d14001d 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16030,13 +16030,13 @@ gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88
 
 	.align 2
 gFireRedMenuElements1_Pal:: @ 8E95D9C
-	.incbin "graphics/interface/menu1.gbapal"
+	.incbin "graphics/interface/dex_caught_pokeball.gbapal"
 
 gFireRedMenuElements2_Pal:: @ 8E95DBC
-	.incbin "graphics/interface/menu2.gbapal"
+	.incbin "graphics/interface/pokemon_types.gbapal"
 
 gFireRedMenuElements_Gfx:: @ 8E95DDC
-	.incbin "graphics/interface/menu.4bpp"
+	.incbin "graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp"
 
 gUnknown_8E97DDC:: @ 8E97DDC
 	.incbin "baserom.gba", 0xE97DDC, 0x20 @UNKNOWN
diff --git a/graphics/interface/dex_caught_pokeball.pal b/graphics/interface/dex_caught_pokeball.pal
new file mode 100644
index 000000000..ab57da621
--- /dev/null
+++ b/graphics/interface/dex_caught_pokeball.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 156 131
+238 238 238
+0 0 0
+213 213 189
+172 164 123
+255 131 123
+238 49 0
+222 49 16
+197 49 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/dex_caught_pokeball_and_pokemon_types.png b/graphics/interface/dex_caught_pokeball_and_pokemon_types.png
new file mode 100644
index 000000000..4a9e67954
Binary files /dev/null and b/graphics/interface/dex_caught_pokeball_and_pokemon_types.png differ
diff --git a/graphics/interface/menu.png b/graphics/interface/menu.png
deleted file mode 100644
index 4a9e67954..000000000
Binary files a/graphics/interface/menu.png and /dev/null differ
diff --git a/graphics/interface/menu1.pal b/graphics/interface/menu1.pal
deleted file mode 100644
index ab57da621..000000000
--- a/graphics/interface/menu1.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-123 156 131
-238 238 238
-0 0 0
-213 213 189
-172 164 123
-255 131 123
-238 49 0
-222 49 16
-197 49 41
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/interface/menu2.pal b/graphics/interface/menu2.pal
deleted file mode 100644
index 16a03be2c..000000000
--- a/graphics/interface/menu2.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-123 156 131
-238 49 0
-246 131 49
-255 180 16
-222 230 49
-123 205 82
-156 222 222
-106 148 246
-164 65 164
-172 172 123
-222 222 197
-189 164 57
-255 90 139
-82 123 139
-65 65 65
-255 255 255
diff --git a/graphics/interface/pokemon_types.pal b/graphics/interface/pokemon_types.pal
new file mode 100644
index 000000000..16a03be2c
--- /dev/null
+++ b/graphics/interface/pokemon_types.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 156 131
+238 49 0
+246 131 49
+255 180 16
+222 230 49
+123 205 82
+156 222 222
+106 148 246
+164 65 164
+172 172 123
+222 222 197
+189 164 57
+255 90 139
+82 123 139
+65 65 65
+255 255 255
-- 
cgit v1.2.3