summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-20 14:36:32 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-20 14:36:32 -0600
commit7383117626ebb2b3d993e5ad8855da5752c9cce8 (patch)
tree3ae0dfd8fe8554dc661f5f70a95d4a17b9cbd74c
parent22d4763c033cdd5ec54a495fbf9d08c92b534f6d (diff)
turns out graphics are the same. I forgot to run 'make clean' :(
-rw-r--r--data/graphics.s16
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_00.pngbin78 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_01.pngbin113 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_02.pngbin113 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_03.pngbin113 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_04.pngbin113 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_05.pngbin113 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_06.pngbin113 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_07.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_08.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_09.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_10.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_11.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_12.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_13.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_14.pngbin112 -> 0 bytes
-rw-r--r--graphics/interface/outline_cursor_debug/outline_cursor_15.pngbin111 -> 0 bytes
-rw-r--r--src/data/menu_cursor_de.h19
18 files changed, 0 insertions, 35 deletions
diff --git a/data/graphics.s b/data/graphics.s
index 5a8af35df..e68a2130a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -18,12 +18,8 @@ gUnknown_08D00524:: @ 8D00524
.include "data/graphics/pokemon/circled_question_mark_graphics.inc"
@ 8D019E4
-.if DEBUG
- .incbin "baserom_de_debug.gba", 0xD019E4, 0xD02458-0xD019E4
-.else
.incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff
.incbin "graphics/unused/old_charmap.bin.lz"
-.endif
.incbin "graphics/unused/old_charmap.gbapal.lz"
.align 2
@@ -2871,11 +2867,7 @@ gBattleAnimSpritePalette_068:: @ 8E69628
.align 2
gContestApplauseGfx::
-.if DEBUG
- .incbin "baserom_de_debug.gba", 0xE696E0, 0xE69818-0xE696E0
-.else
.incbin "graphics/contest/applause.4bpp.lz"
-.endif
.align 2
gContestApplauseMeterGfx:: @ 8E6978C
@@ -2986,11 +2978,7 @@ gUnknown_08E6C100:: @ 8E6C100
.align 2
gUnknown_08E6C920:: @ 8E6C920
-.if DEBUG
- .incbin "baserom_de_debug.gba", 0xE6C9AC, 0xE6D3E0-0xE6C9AC
-.else
.incbin "graphics/berry_blender/outer.4bpp.lz"
-.endif
.align 2
gUnknown_08E6D354:: @ 8E6D354
@@ -3150,11 +3138,7 @@ gBattleAnimSpritePalette_188:: @ 8E7133C
.align 2
gPartyMenuMisc_Gfx:: @ 8E71354
-.if DEBUG
- .incbin "baserom_de_debug.gba", 0xE713E0, 0xE71730-0xE713E0
-.else
.incbin "graphics/interface/party_menu_misc.4bpp.lz"
-.endif
.align 2
gPartyMenuMisc_Pal:: @ 8E716A0
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_00.png b/graphics/interface/outline_cursor_debug/outline_cursor_00.png
deleted file mode 100644
index 8a0cb601e..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_00.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_01.png b/graphics/interface/outline_cursor_debug/outline_cursor_01.png
deleted file mode 100644
index 06c691712..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_01.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_02.png b/graphics/interface/outline_cursor_debug/outline_cursor_02.png
deleted file mode 100644
index bbf2e3c11..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_02.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_03.png b/graphics/interface/outline_cursor_debug/outline_cursor_03.png
deleted file mode 100644
index ae0d96a01..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_03.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_04.png b/graphics/interface/outline_cursor_debug/outline_cursor_04.png
deleted file mode 100644
index 80f3e5063..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_04.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_05.png b/graphics/interface/outline_cursor_debug/outline_cursor_05.png
deleted file mode 100644
index ec06e1daf..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_05.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_06.png b/graphics/interface/outline_cursor_debug/outline_cursor_06.png
deleted file mode 100644
index edab769fc..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_06.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_07.png b/graphics/interface/outline_cursor_debug/outline_cursor_07.png
deleted file mode 100644
index 1404affb0..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_07.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_08.png b/graphics/interface/outline_cursor_debug/outline_cursor_08.png
deleted file mode 100644
index cfb72a578..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_08.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_09.png b/graphics/interface/outline_cursor_debug/outline_cursor_09.png
deleted file mode 100644
index 4d8525a13..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_09.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_10.png b/graphics/interface/outline_cursor_debug/outline_cursor_10.png
deleted file mode 100644
index 1bf65a4e1..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_10.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_11.png b/graphics/interface/outline_cursor_debug/outline_cursor_11.png
deleted file mode 100644
index e0545ffe2..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_11.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_12.png b/graphics/interface/outline_cursor_debug/outline_cursor_12.png
deleted file mode 100644
index b79b3cfe8..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_12.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_13.png b/graphics/interface/outline_cursor_debug/outline_cursor_13.png
deleted file mode 100644
index 4ddef4874..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_13.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_14.png b/graphics/interface/outline_cursor_debug/outline_cursor_14.png
deleted file mode 100644
index 34792f961..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_14.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_15.png b/graphics/interface/outline_cursor_debug/outline_cursor_15.png
deleted file mode 100644
index 8f958c189..000000000
--- a/graphics/interface/outline_cursor_debug/outline_cursor_15.png
+++ /dev/null
Binary files differ
diff --git a/src/data/menu_cursor_de.h b/src/data/menu_cursor_de.h
index 7be9e96aa..cd56f51d9 100644
--- a/src/data/menu_cursor_de.h
+++ b/src/data/menu_cursor_de.h
@@ -1,24 +1,6 @@
#ifndef GUARD_DATA_MENU_CURSOR_H
#define GUARD_DATA_MENU_CURSOR_H
-#if DEBUG
-const u8 OutlineCursorTiles_00[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_00.4bpp");
-const u8 OutlineCursorTiles_01[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_01.4bpp");
-const u8 OutlineCursorTiles_02[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_02.4bpp");
-const u8 OutlineCursorTiles_03[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_03.4bpp");
-const u8 OutlineCursorTiles_04[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_04.4bpp");
-const u8 OutlineCursorTiles_05[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_05.4bpp");
-const u8 OutlineCursorTiles_06[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_06.4bpp");
-const u8 OutlineCursorTiles_07[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_07.4bpp");
-const u8 OutlineCursorTiles_08[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_08.4bpp");
-const u8 OutlineCursorTiles_09[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_09.4bpp");
-const u8 OutlineCursorTiles_10[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_10.4bpp");
-const u8 OutlineCursorTiles_11[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_11.4bpp");
-const u8 OutlineCursorTiles_12[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_12.4bpp");
-const u8 OutlineCursorTiles_13[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_13.4bpp");
-const u8 OutlineCursorTiles_14[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_14.4bpp");
-const u8 OutlineCursorTiles_15[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_15.4bpp");
-#else
const u8 OutlineCursorTiles_00[] = INCBIN_U8("graphics/interface/outline_cursor_00.4bpp");
const u8 OutlineCursorTiles_01[] = INCBIN_U8("graphics/interface/outline_cursor_01.4bpp");
const u8 OutlineCursorTiles_02[] = INCBIN_U8("graphics/interface/outline_cursor_02.4bpp");
@@ -35,7 +17,6 @@ const u8 OutlineCursorTiles_12[] = INCBIN_U8("graphics/interface/outline_cursor_
const u8 OutlineCursorTiles_13[] = INCBIN_U8("graphics/interface/outline_cursor_13.4bpp");
const u8 OutlineCursorTiles_14[] = INCBIN_U8("graphics/interface/outline_cursor_14.4bpp");
const u8 OutlineCursorTiles_15[] = INCBIN_U8("graphics/interface/outline_cursor_15.4bpp");
-#endif
const struct OamData gOamData_842F11C = {
.objMode = ST_OAM_OBJ_NORMAL,