From 420b36ca36d7fceefb8fd80417420b2d0bd3ed30 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sat, 29 Jun 2024 20:53:51 -0400
Subject: [PATCH] Final french gfx matching diffs

---
 .../pokenav/match_call/{ui_fr.png => french/ui.png} | Bin
 .../match_call/{ui_it.png => italian/ui.png}        | Bin
 graphics_file_rules.mk                              |  12 ++++++++++++
 src/graphics.c                                      |   4 ++--
 4 files changed, 14 insertions(+), 2 deletions(-)
 rename graphics/pokenav/match_call/{ui_fr.png => french/ui.png} (100%)
 rename graphics/pokenav/match_call/{ui_it.png => italian/ui.png} (100%)

diff --git a/graphics/pokenav/match_call/ui_fr.png b/graphics/pokenav/match_call/french/ui.png
similarity index 100%
rename from graphics/pokenav/match_call/ui_fr.png
rename to graphics/pokenav/match_call/french/ui.png
diff --git a/graphics/pokenav/match_call/ui_it.png b/graphics/pokenav/match_call/italian/ui.png
similarity index 100%
rename from graphics/pokenav/match_call/ui_it.png
rename to graphics/pokenav/match_call/italian/ui.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 8cefa78db6..92283c0b17 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -158,6 +158,12 @@ $(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
 $(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 502 -Wnum_tiles
 
+$(TILESETGFXDIR)/secondary/shop/french/tiles.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 502
+
+$(TILESETGFXDIR)/secondary/shop/italian/tiles.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 502 -Wnum_tiles
+
 $(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 478 -Wnum_tiles
 
@@ -790,6 +796,12 @@ $(PKNAVGFXDIR)/device_outline.4bpp: %.4bpp: %.png
 $(PKNAVGFXDIR)/match_call/ui.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
 
+$(PKNAVGFXDIR)/match_call/french/ui.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
+	
+$(PKNAVGFXDIR)/match_call/italian/ui.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
+
 $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
 	$(GFX) $< $@ -num_tiles 232 -Wnum_tiles
 
diff --git a/src/graphics.c b/src/graphics.c
index 62f39a9dee..86875a38ef 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -2035,9 +2035,9 @@ const u32 gTilesetTiles_BattleDome[] = INCBIN_U32("data/tilesets/secondary/battl
 // pokenav match call gfx
 const u16 gMatchCallUI_Pal[] = INCBIN_U16("graphics/pokenav/match_call/ui.gbapal");
 #if FRENCH
-const u32 gMatchCallUI_Gfx[] = INCBIN_U32("graphics/pokenav/match_call/ui_fr.4bpp.lz");
+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/ui_it.4bpp.lz");
+const u32 gMatchCallUI_Gfx[] = INCBIN_U32("graphics/pokenav/match_call/italian/ui.4bpp.lz");
 #endif
 const u32 gMatchCallUI_Tilemap[] = INCBIN_U32("graphics/pokenav/match_call/ui.bin.lz");