diff --git a/data/tilesets/secondary/battle_dome/spanish/tiles.png b/data/tilesets/secondary/battle_dome/spanish/tiles.png
new file mode 100644
index 0000000000..7dd6d34d33
Binary files /dev/null and b/data/tilesets/secondary/battle_dome/spanish/tiles.png differ
diff --git a/data/tilesets/secondary/shop/spanish/tiles.png b/data/tilesets/secondary/shop/spanish/tiles.png
new file mode 100644
index 0000000000..08fd133238
Binary files /dev/null and b/data/tilesets/secondary/shop/spanish/tiles.png differ
diff --git a/graphics/pokenav/condition/spanish/search_results.png b/graphics/pokenav/condition/spanish/search_results.png
new file mode 100644
index 0000000000..5dac26dfa5
Binary files /dev/null and b/graphics/pokenav/condition/spanish/search_results.png differ
diff --git a/graphics/pokenav/match_call/spanish/ui.png b/graphics/pokenav/match_call/spanish/ui.png
new file mode 100644
index 0000000000..4342c6ce7d
Binary files /dev/null and b/graphics/pokenav/match_call/spanish/ui.png differ
diff --git a/graphics/pokenav/ribbons/spanish/list_bg.png b/graphics/pokenav/ribbons/spanish/list_bg.png
new file mode 100644
index 0000000000..207dba9a0a
Binary files /dev/null and b/graphics/pokenav/ribbons/spanish/list_bg.png differ
diff --git a/include/graphics.h b/include/graphics.h
index 1dd9b6d89b..45de56db81 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -5070,7 +5070,7 @@ extern const u8 gMailTilemap_Retro[];
 extern const u8 gMonMarkingsMenu_Gfx[];
 extern const u16 gMonMarkingsMenu_Pal[];
 
-#if FRENCH || ITALIAN
+#if EUROPE
 extern const u16 gPokeJumpBonuses_Pal[];
 extern const u32 gPokeJumpBonuses_Gfx[];
 extern const u32 gPokeJumpBonuses_Tilemap[];
diff --git a/include/international_string_util.h b/include/international_string_util.h
index 84eb0c9f6e..09ea4c53b5 100644
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -20,7 +20,7 @@ void ConvertInternationalPlayerNameStripChar(u8 *, u8);
 void ConvertInternationalContestantName(u8 *);
 int GetNicknameLanguage(u8 *);
 void FillWindowTilesByRow(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows);
-#if FRENCH || ITALIAN
+#if EUROPE
 u8 *StringAppendWithPlaceholder(u8 *dest, const u8 *src, u8 *placeholderStr);
 const u8 *GetTrainerClassNameGenderSpecific(s32 trainerClassId, u32 trainerGender, const u8 *trainerName);
 #endif
diff --git a/include/strings.h b/include/strings.h
index 273eccdfb1..d0a93190a7 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -3030,7 +3030,7 @@ extern const u8 gText_Summary2[];
 extern const u8 gText_PkmnForSwap[];
 extern const u8 gText_SamePkmnInPartyAlready[];
 extern const u8 gText_Cancel3[];
-#if FRENCH || ITALIAN
+#if EUROPE
 extern const u8 gText_Eleve[];
 extern const u8 gText_Dresseur[];
 extern const u8 gText_Champion[];
diff --git a/include/tilesets.h b/include/tilesets.h
index 46fd3c4bef..4753eba44c 100644
--- a/include/tilesets.h
+++ b/include/tilesets.h
@@ -4,7 +4,7 @@
 extern const u32 gTilesetTiles_General[];
 extern const u16 gTilesetPalettes_General[][16];
 
-#if FRENCH || ITALIAN
+#if EUROPE
 extern const u32 gTilesetTiles_Shop[];
 extern const u16 gTilesetPalettes_Shop[][16];
 
diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h
index bcb1c2b36a..4a1a237598 100644
--- a/src/data/tilesets/graphics.h
+++ b/src/data/tilesets/graphics.h
@@ -350,7 +350,7 @@ const u16 gTilesetPalettes_InsideBuilding[][16] =
 	INCBIN_U16("data/tilesets/primary/building/palettes/15.gbapal"),
 };
 
-#if !defined(FRENCH) && !defined(ITALIAN)
+#if !EUROPE
 const u32 gTilesetTiles_Shop[] = INCBIN_U32("data/tilesets/secondary/shop/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Shop[][16] =
@@ -1329,7 +1329,7 @@ const u16 gTilesetPalettes_BattlePalace[][16] =
 	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/15.gbapal"),
 };
 
-#if !defined(FRENCH) && !defined(ITALIAN)
+#if !EUROPE
 const u32 gTilesetTiles_BattleDome[] = INCBIN_U32("data/tilesets/secondary/battle_dome/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleDome[][16] =
diff --git a/src/graphics.c b/src/graphics.c
index cae6624a1d..aaa9d50ec9 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1915,8 +1915,8 @@ const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.g
 const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/crusher.4bpp.lz");
 const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/text_windows.bin.lz");
 
-#if FRENCH || ITALIAN
-// Moved from other files in the French and Italian versions.
+#if EUROPE
+// Moved from other files in the French, Italian and Spanish versions.
 
 // credits
 #if FRENCH
@@ -1969,6 +1969,8 @@ const u16 gTilesetPalettes_Shop[][16] =
 const u32 gTilesetTiles_Shop[] = INCBIN_U32("data/tilesets/secondary/shop/french/tiles.4bpp.lz");
 #elif ITALIAN
 const u32 gTilesetTiles_Shop[] = INCBIN_U32("data/tilesets/secondary/shop/italian/tiles.4bpp.lz");
+#elif SPANISH
+const u32 gTilesetTiles_Shop[] = INCBIN_U32("data/tilesets/secondary/shop/spanish/tiles.4bpp.lz");
 #endif
 
 // roulette
@@ -2020,6 +2022,8 @@ const u16 gTilesetPalettes_BattleDome[][16] =
 const u32 gTilesetTiles_BattleDome[] = INCBIN_U32("data/tilesets/secondary/battle_dome/french/tiles.4bpp.lz");
 #elif ITALIAN
 const u32 gTilesetTiles_BattleDome[] = INCBIN_U32("data/tilesets/secondary/battle_dome/italian/tiles.4bpp.lz");
+#elif SPANISH
+const u32 gTilesetTiles_BattleDome[] = INCBIN_U32("data/tilesets/secondary/battle_dome/spanish/tiles.4bpp.lz");
 #endif
 
 // pokenav match call gfx
@@ -2028,6 +2032,8 @@ const u16 gMatchCallUI_Pal[] = INCBIN_U16("graphics/pokenav/match_call/ui.gbapal
 const u32 gMatchCallUI_Gfx[] = INCBIN_U32("graphics/pokenav/match_call/french/ui.4bpp.lz");
 #elif ITALIAN
 const u32 gMatchCallUI_Gfx[] = INCBIN_U32("graphics/pokenav/match_call/italian/ui.4bpp.lz");
+#elif SPANISH
+const u32 gMatchCallUI_Gfx[] = INCBIN_U32("graphics/pokenav/match_call/spanish/ui.4bpp.lz");
 #endif
 const u32 gMatchCallUI_Tilemap[] = INCBIN_U32("graphics/pokenav/match_call/ui.bin.lz");
 
@@ -2037,6 +2043,8 @@ const u16 gConditionSearchResultFramePal[] = INCBIN_U16("graphics/pokenav/condit
 const u32 gConditionSearchResultTiles[] = INCBIN_U32("graphics/pokenav/condition/french/search_results.4bpp.lz");
 #elif ITALIAN
 const u32 gConditionSearchResultTiles[] = INCBIN_U32("graphics/pokenav/condition/italian/search_results.4bpp.lz");
+#elif SPANISH
+const u32 gConditionSearchResultTiles[] = INCBIN_U32("graphics/pokenav/condition/spanish/search_results.4bpp.lz");
 #endif
 const u32 gConditionSearchResultTilemap[] = INCBIN_U32("graphics/pokenav/condition/search_results.bin.lz");
 
@@ -2046,6 +2054,8 @@ const u16 gMonRibbonListFramePal[] = INCBIN_U16("graphics/pokenav/ribbons/list_b
 const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/french/list_bg.4bpp.lz");
 #elif ITALIAN
 const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/italian/list_bg.4bpp.lz");
+#elif SPANISH
+const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/spanish/list_bg.4bpp.lz");
 #endif
 const u32 gMonRibbonListFrameTilemap[] = INCBIN_U32("graphics/pokenav/ribbons/list_bg.bin.lz");
 
diff --git a/src/international_string_util.c b/src/international_string_util.c
index d10c8c01f4..e67bf097aa 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -243,7 +243,7 @@ void FillWindowTilesByRow(int windowId, int columnStart, int rowStart, int numFi
     }
 }
 
-#if FRENCH || ITALIAN
+#if EUROPE
 u8 *StringAppendWithPlaceholder(u8 *dest, const u8 *src, u8 *placeholderStr)
 {
     u8 text[32], c;
@@ -272,6 +272,8 @@ u8 *StringAppendWithPlaceholder(u8 *dest, const u8 *src, u8 *placeholderStr)
 const u8 gText_LevyTatia[] = _("LEVY&TATIA");
 #elif ITALIAN
 const u8 gText_LevyTatia[] = _("TELL & PAT");
+#elif SPANISH
+const u8 gText_LevyTatia[] = _("VITO-LETI");
 #endif
 
 const u8 *GetTrainerClassNameGenderSpecific(s32 trainerClassId, u32 trainerGender, const u8 *trainerName)