From 73392181fe47fd0fe5ac3702978307926a442ef4 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 18:08:02 -0600 Subject: resolve more undefined references --- src/data/pokedex_entries_de.h | 3 ++- src/data/pokedex_entries_en.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/data') diff --git a/src/data/pokedex_entries_de.h b/src/data/pokedex_entries_de.h index 0f64cba66..413b73d90 100644 --- a/src/data/pokedex_entries_de.h +++ b/src/data/pokedex_entries_de.h @@ -6337,7 +6337,8 @@ static const u8 DexDescription_Deoxys_2[] = _( "dieses POKéMON ist sein Gehirn."); #endif -static const struct PokedexEntry gPokedexEntries[] = { +const struct PokedexEntry gPokedexEntries[] = +{ { // Dummy .categoryName = _("UNBEKANNT"), diff --git a/src/data/pokedex_entries_en.h b/src/data/pokedex_entries_en.h index 86da3d67b..933b1fc7d 100644 --- a/src/data/pokedex_entries_en.h +++ b/src/data/pokedex_entries_en.h @@ -5389,7 +5389,7 @@ static const u8 DexDescription_Deoxys_2[] = _( "chest appears to be its brain."); #endif -static const struct PokedexEntry gPokedexEntries[] = +const struct PokedexEntry gPokedexEntries[] = { { //Dummy .categoryName = _("UNKNOWN"), -- cgit v1.2.3 From c9f2902f0ebce0cff90c9a06f9ae05b921b17448 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 19 Jan 2018 15:48:40 -0600 Subject: dump outline cursors for debug ROM --- src/data/menu_cursor_de.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/data') diff --git a/src/data/menu_cursor_de.h b/src/data/menu_cursor_de.h index cd56f51d9..7be9e96aa 100644 --- a/src/data/menu_cursor_de.h +++ b/src/data/menu_cursor_de.h @@ -1,6 +1,24 @@ #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"); @@ -17,6 +35,7 @@ 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, -- cgit v1.2.3 From 7383117626ebb2b3d993e5ad8855da5752c9cce8 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 20 Jan 2018 14:36:32 -0600 Subject: turns out graphics are the same. I forgot to run 'make clean' :( --- src/data/menu_cursor_de.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/data') 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, -- cgit v1.2.3