From 3b498d5df30ca85dd43748f772b93a05f027ec7b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 29 Jun 2024 22:25:06 -0400 Subject: [PATCH] Started to standarize graphics folders --- .../tourney_buttons.png} | Bin .../tourney_buttons.png} | Bin .../button_window.png} | Bin .../{mode_fr.png => french/mode.png} | Bin .../button_window.png} | Bin .../{mode_it.png => italian/mode.png} | Bin .../{321start_fr.png => french/321start.png} | Bin .../{321start_it.png => italian/321start.png} | Bin .../city_zoom_text.png} | Bin .../{header_fr.bin => french/header.bin} | Bin .../{header_fr.png => french/header.png} | Bin .../city_zoom_text.png} | Bin .../{header_it.bin => italian/header.bin} | Bin .../{header_it.png => italian/header.png} | Bin .../{list_bg_fr.png => french/list_bg.png} | Bin .../{list_bg_it.png => italian/list_bg.png} | Bin .../shop/{money_fr.png => french/money.png} | Bin .../shop/{money_it.png => italian/money.png} | Bin .../reel_symbols/{6_fr.png => french/6.png} | Bin .../trade/{menu_fr.png => french/menu.png} | Bin .../trade/{menu_it.png => italian/menu.png} | Bin .../{card_fr.png => french/card.png} | Bin .../{front_fr.bin => french/front.bin} | Bin .../front_link.bin} | Bin .../frlg/{card_fr.png => french/card.png} | Bin .../frlg/{back_it.bin => italian/back.bin} | Bin .../frlg/{card_it.png => italian/card.png} | Bin .../{card_it.png => italian/card.png} | Bin src/data/graphics/slot_machine.h | 2 +- src/graphics.c | 54 +++++++++--------- 30 files changed, 28 insertions(+), 28 deletions(-) rename graphics/battle_frontier/{tourney_buttons_fr.png => french/tourney_buttons.png} (100%) rename graphics/battle_frontier/{tourney_buttons_it.png => italian/tourney_buttons.png} (100%) rename graphics/easy_chat/{button_window_fr.png => french/button_window.png} (100%) rename graphics/easy_chat/{mode_fr.png => french/mode.png} (100%) rename graphics/easy_chat/{button_window_it.png => italian/button_window.png} (100%) rename graphics/easy_chat/{mode_it.png => italian/mode.png} (100%) rename graphics/link/{321start_fr.png => french/321start.png} (100%) rename graphics/link/{321start_it.png => italian/321start.png} (100%) rename graphics/pokenav/{city_zoom_text_fr.png => french/city_zoom_text.png} (100%) rename graphics/pokenav/{header_fr.bin => french/header.bin} (100%) rename graphics/pokenav/{header_fr.png => french/header.png} (100%) rename graphics/pokenav/{city_zoom_text_it.png => italian/city_zoom_text.png} (100%) rename graphics/pokenav/{header_it.bin => italian/header.bin} (100%) rename graphics/pokenav/{header_it.png => italian/header.png} (100%) rename graphics/pokenav/ribbons/{list_bg_fr.png => french/list_bg.png} (100%) rename graphics/pokenav/ribbons/{list_bg_it.png => italian/list_bg.png} (100%) rename graphics/shop/{money_fr.png => french/money.png} (100%) rename graphics/shop/{money_it.png => italian/money.png} (100%) rename graphics/slot_machine/reel_symbols/{6_fr.png => french/6.png} (100%) rename graphics/trade/{menu_fr.png => french/menu.png} (100%) rename graphics/trade/{menu_it.png => italian/menu.png} (100%) rename graphics/trainer_card/{card_fr.png => french/card.png} (100%) rename graphics/trainer_card/{front_fr.bin => french/front.bin} (100%) rename graphics/trainer_card/{front_link_fr.bin => french/front_link.bin} (100%) rename graphics/trainer_card/frlg/{card_fr.png => french/card.png} (100%) rename graphics/trainer_card/frlg/{back_it.bin => italian/back.bin} (100%) rename graphics/trainer_card/frlg/{card_it.png => italian/card.png} (100%) rename graphics/trainer_card/{card_it.png => italian/card.png} (100%) diff --git a/graphics/battle_frontier/tourney_buttons_fr.png b/graphics/battle_frontier/french/tourney_buttons.png similarity index 100% rename from graphics/battle_frontier/tourney_buttons_fr.png rename to graphics/battle_frontier/french/tourney_buttons.png diff --git a/graphics/battle_frontier/tourney_buttons_it.png b/graphics/battle_frontier/italian/tourney_buttons.png similarity index 100% rename from graphics/battle_frontier/tourney_buttons_it.png rename to graphics/battle_frontier/italian/tourney_buttons.png diff --git a/graphics/easy_chat/button_window_fr.png b/graphics/easy_chat/french/button_window.png similarity index 100% rename from graphics/easy_chat/button_window_fr.png rename to graphics/easy_chat/french/button_window.png diff --git a/graphics/easy_chat/mode_fr.png b/graphics/easy_chat/french/mode.png similarity index 100% rename from graphics/easy_chat/mode_fr.png rename to graphics/easy_chat/french/mode.png diff --git a/graphics/easy_chat/button_window_it.png b/graphics/easy_chat/italian/button_window.png similarity index 100% rename from graphics/easy_chat/button_window_it.png rename to graphics/easy_chat/italian/button_window.png diff --git a/graphics/easy_chat/mode_it.png b/graphics/easy_chat/italian/mode.png similarity index 100% rename from graphics/easy_chat/mode_it.png rename to graphics/easy_chat/italian/mode.png diff --git a/graphics/link/321start_fr.png b/graphics/link/french/321start.png similarity index 100% rename from graphics/link/321start_fr.png rename to graphics/link/french/321start.png diff --git a/graphics/link/321start_it.png b/graphics/link/italian/321start.png similarity index 100% rename from graphics/link/321start_it.png rename to graphics/link/italian/321start.png diff --git a/graphics/pokenav/city_zoom_text_fr.png b/graphics/pokenav/french/city_zoom_text.png similarity index 100% rename from graphics/pokenav/city_zoom_text_fr.png rename to graphics/pokenav/french/city_zoom_text.png diff --git a/graphics/pokenav/header_fr.bin b/graphics/pokenav/french/header.bin similarity index 100% rename from graphics/pokenav/header_fr.bin rename to graphics/pokenav/french/header.bin diff --git a/graphics/pokenav/header_fr.png b/graphics/pokenav/french/header.png similarity index 100% rename from graphics/pokenav/header_fr.png rename to graphics/pokenav/french/header.png diff --git a/graphics/pokenav/city_zoom_text_it.png b/graphics/pokenav/italian/city_zoom_text.png similarity index 100% rename from graphics/pokenav/city_zoom_text_it.png rename to graphics/pokenav/italian/city_zoom_text.png diff --git a/graphics/pokenav/header_it.bin b/graphics/pokenav/italian/header.bin similarity index 100% rename from graphics/pokenav/header_it.bin rename to graphics/pokenav/italian/header.bin diff --git a/graphics/pokenav/header_it.png b/graphics/pokenav/italian/header.png similarity index 100% rename from graphics/pokenav/header_it.png rename to graphics/pokenav/italian/header.png diff --git a/graphics/pokenav/ribbons/list_bg_fr.png b/graphics/pokenav/ribbons/french/list_bg.png similarity index 100% rename from graphics/pokenav/ribbons/list_bg_fr.png rename to graphics/pokenav/ribbons/french/list_bg.png diff --git a/graphics/pokenav/ribbons/list_bg_it.png b/graphics/pokenav/ribbons/italian/list_bg.png similarity index 100% rename from graphics/pokenav/ribbons/list_bg_it.png rename to graphics/pokenav/ribbons/italian/list_bg.png diff --git a/graphics/shop/money_fr.png b/graphics/shop/french/money.png similarity index 100% rename from graphics/shop/money_fr.png rename to graphics/shop/french/money.png diff --git a/graphics/shop/money_it.png b/graphics/shop/italian/money.png similarity index 100% rename from graphics/shop/money_it.png rename to graphics/shop/italian/money.png diff --git a/graphics/slot_machine/reel_symbols/6_fr.png b/graphics/slot_machine/reel_symbols/french/6.png similarity index 100% rename from graphics/slot_machine/reel_symbols/6_fr.png rename to graphics/slot_machine/reel_symbols/french/6.png diff --git a/graphics/trade/menu_fr.png b/graphics/trade/french/menu.png similarity index 100% rename from graphics/trade/menu_fr.png rename to graphics/trade/french/menu.png diff --git a/graphics/trade/menu_it.png b/graphics/trade/italian/menu.png similarity index 100% rename from graphics/trade/menu_it.png rename to graphics/trade/italian/menu.png diff --git a/graphics/trainer_card/card_fr.png b/graphics/trainer_card/french/card.png similarity index 100% rename from graphics/trainer_card/card_fr.png rename to graphics/trainer_card/french/card.png diff --git a/graphics/trainer_card/front_fr.bin b/graphics/trainer_card/french/front.bin similarity index 100% rename from graphics/trainer_card/front_fr.bin rename to graphics/trainer_card/french/front.bin diff --git a/graphics/trainer_card/front_link_fr.bin b/graphics/trainer_card/french/front_link.bin similarity index 100% rename from graphics/trainer_card/front_link_fr.bin rename to graphics/trainer_card/french/front_link.bin diff --git a/graphics/trainer_card/frlg/card_fr.png b/graphics/trainer_card/frlg/french/card.png similarity index 100% rename from graphics/trainer_card/frlg/card_fr.png rename to graphics/trainer_card/frlg/french/card.png diff --git a/graphics/trainer_card/frlg/back_it.bin b/graphics/trainer_card/frlg/italian/back.bin similarity index 100% rename from graphics/trainer_card/frlg/back_it.bin rename to graphics/trainer_card/frlg/italian/back.bin diff --git a/graphics/trainer_card/frlg/card_it.png b/graphics/trainer_card/frlg/italian/card.png similarity index 100% rename from graphics/trainer_card/frlg/card_it.png rename to graphics/trainer_card/frlg/italian/card.png diff --git a/graphics/trainer_card/card_it.png b/graphics/trainer_card/italian/card.png similarity index 100% rename from graphics/trainer_card/card_it.png rename to graphics/trainer_card/italian/card.png diff --git a/src/data/graphics/slot_machine.h b/src/data/graphics/slot_machine.h index a76b035025c1..7442c6c704fb 100644 --- a/src/data/graphics/slot_machine.h +++ b/src/data/graphics/slot_machine.h @@ -35,7 +35,7 @@ const u8 gSlotMachineReelSymbol7Tiles[] = INCBIN_U8("graphics/slot_machine/reel_ const u32 gSlotMachineDigitalDisplay_Gfx[] = INCBIN_U32("graphics/slot_machine/digital_display.4bpp.lz"); #elif FRENCH || ITALIAN -const u8 gSlotMachineReelSymbol6Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/6_fr.4bpp"); +const u8 gSlotMachineReelSymbol6Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/french/6.4bpp"); const u8 gSlotMachineReelSymbol7Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/7.4bpp"); // The 'REG' text is missing in the French and Italian versions. const u32 gSlotMachineDigitalDisplay_Gfx[] = INCBIN_U32("graphics/slot_machine/fr/digital_display.4bpp.lz"); diff --git a/src/graphics.c b/src/graphics.c index 86875a38ef19..cd490006dd23 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1018,9 +1018,9 @@ const u32 gDomeTourneyInfoCardBg_Tilemap[] = INCBIN_U32("graphics/battle_frontie #if ENGLISH const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons.4bpp.lz"); // exit/cancel and pokeball buttons #elif FRENCH -const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons_fr.4bpp.lz"); // exit/cancel and pokeball buttons +const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/french/tourney_buttons.4bpp.lz"); // exit/cancel and pokeball buttons #elif ITALIAN -const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons_it.4bpp.lz"); // exit/cancel and pokeball buttons +const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/italian/tourney_buttons.4bpp.lz"); // exit/cancel and pokeball buttons #endif const u32 gDomeTourneyTree_Pal[] = INCBIN_U32("graphics/battle_frontier/tourney.gbapal.lz"); const u32 gDomeTourneyTreeButtons_Pal[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons.gbapal.lz"); @@ -1276,9 +1276,9 @@ const u32 gShopMenu_Tilemap[] = INCBIN_U32("graphics/shop/menu.bin.lz"); #if ENGLISH const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("graphics/shop/money.4bpp.lz"); #elif FRENCH -const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("graphics/shop/money_fr.4bpp.lz"); +const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("graphics/shop/french/money.4bpp.lz"); #elif ITALIAN -const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("graphics/shop/money_it.4bpp.lz"); +const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("graphics/shop/italian/money.4bpp.lz"); #endif // Pokeblock @@ -1523,8 +1523,8 @@ const u32 gPokenavLeftHeaderTough_Gfx[] = INCBIN_U32("graphics/pokenav/left_head const u32 gPokenavLeftHeaderCool_Gfx[] = INCBIN_U32("graphics/pokenav/left_headers/cool.4bpp.lz"); const u32 gPokenavLeftHeaderParty_Gfx[] = INCBIN_U32("graphics/pokenav/left_headers/party.4bpp.lz"); #elif FRENCH -const u32 gPokenavHeader_Gfx[] = INCBIN_U32("graphics/pokenav/header_fr.4bpp.lz"); // TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this -const u32 gPokenavHeader_Tilemap[] = INCBIN_U32("graphics/pokenav/header_fr.bin.lz"); +const u32 gPokenavHeader_Gfx[] = INCBIN_U32("graphics/pokenav/french/header.4bpp.lz"); // TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this +const u32 gPokenavHeader_Tilemap[] = INCBIN_U32("graphics/pokenav/french/header.bin.lz"); const u16 gPokenavLeftHeader_Pal[] = INCBIN_U16("graphics/pokenav/left_headers/palette.gbapal"); const u32 gPokenavLeftHeaderBeauty_Gfx[] = INCBIN_U32("graphics/pokenav/left_headers/french/beauty.4bpp.lz"); @@ -1540,8 +1540,8 @@ const u32 gPokenavLeftHeaderTough_Gfx[] = INCBIN_U32("graphics/pokenav/left_head const u32 gPokenavLeftHeaderCool_Gfx[] = INCBIN_U32("graphics/pokenav/left_headers/french/cool.4bpp.lz"); const u32 gPokenavLeftHeaderParty_Gfx[] = INCBIN_U32("graphics/pokenav/left_headers/french/party.4bpp.lz"); #elif ITALIAN -const u32 gPokenavHeader_Gfx[] = INCBIN_U32("graphics/pokenav/header_it.4bpp.lz"); // TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this -const u32 gPokenavHeader_Tilemap[] = INCBIN_U32("graphics/pokenav/header_it.bin.lz"); +const u32 gPokenavHeader_Gfx[] = INCBIN_U32("graphics/pokenav/italian/header.4bpp.lz"); // TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this +const u32 gPokenavHeader_Tilemap[] = INCBIN_U32("graphics/pokenav/italian/header.bin.lz"); const u16 gPokenavLeftHeader_Pal[] = INCBIN_U16("graphics/pokenav/left_headers/palette.gbapal"); const u32 gPokenavLeftHeaderBeauty_Gfx[] = INCBIN_U32("graphics/pokenav/left_headers/italian/beauty.4bpp.lz"); @@ -1571,14 +1571,14 @@ const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/c const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/interface/mon_markings_menu.gbapal"); const u8 gMonMarkingsMenu_Gfx[] = INCBIN_U8("graphics/interface/mon_markings_menu.4bpp"); #elif FRENCH -const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_text_fr.4bpp.lz"); +const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/french/city_zoom_text.4bpp.lz"); const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/condition/cancel.gbapal"); const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/french/cancel.4bpp"); const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/interface/mon_markings_menu.gbapal"); const u8 gMonMarkingsMenu_Gfx[] = INCBIN_U8("graphics/interface/french/mon_markings_menu.4bpp"); #elif ITALIAN -const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_text_it.4bpp.lz"); +const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/italian/city_zoom_text.4bpp.lz"); const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/condition/cancel.gbapal"); const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/italian/cancel.4bpp"); @@ -1612,11 +1612,11 @@ const u16 gEasyChatButtonWindow_Pal[] = INCBIN_U16("graphics/easy_chat/button_wi const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_window.4bpp.lz"); const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode.4bpp.lz"); #elif FRENCH -const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_window_fr.4bpp.lz"); -const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode_fr.4bpp.lz"); +const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/french/button_window.4bpp.lz"); +const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/french/mode.4bpp.lz"); #elif ITALIAN -const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_window_it.4bpp.lz"); -const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode_it.4bpp.lz"); +const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/italian/button_window.4bpp.lz"); +const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/italian/mode.4bpp.lz"); #endif const u16 gEasyChatMode_Pal[] = INCBIN_U16("graphics/easy_chat/mode.gbapal"); @@ -1672,13 +1672,13 @@ const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/f const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz"); const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz"); #elif FRENCH -const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_fr.4bpp.lz"); +const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/french/card.4bpp.lz"); const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz"); -const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_fr.bin.lz"); +const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/french/front.bin.lz"); const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz"); -const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link_fr.bin.lz"); +const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/french/front_link.bin.lz"); #elif ITALIAN -const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_it.4bpp.lz"); +const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/italian/card.4bpp.lz"); const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz"); const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin.lz"); const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz"); @@ -1692,15 +1692,15 @@ const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz"); const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz"); #elif FRENCH -const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/card_fr.4bpp.lz"); +const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/french/card.4bpp.lz"); const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz"); const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz"); const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz"); #elif ITALIAN -const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/card_it.4bpp.lz"); +const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/italian/card.4bpp.lz"); const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz"); const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz"); -const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back_it.bin.lz"); +const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/italian/back.bin.lz"); #endif const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz"); @@ -1833,9 +1833,9 @@ const u16 gTradeCursor_Pal[] = INCBIN_U16("graphics/trade/cursor.gbapal"); #if ENGLISH const u8 gTradeMenu_Gfx[] = INCBIN_U8("graphics/trade/menu.4bpp"); #elif FRENCH -const u8 gTradeMenu_Gfx[] = INCBIN_U8("graphics/trade/menu_fr.4bpp"); +const u8 gTradeMenu_Gfx[] = INCBIN_U8("graphics/trade/french/menu.4bpp"); #elif ITALIAN -const u8 gTradeMenu_Gfx[] = INCBIN_U8("graphics/trade/menu_it.4bpp"); +const u8 gTradeMenu_Gfx[] = INCBIN_U8("graphics/trade/italian/menu.4bpp"); #endif const u8 gTradeCursor_Gfx[] = INCBIN_U8("graphics/trade/cursor.4bpp"); const u16 gTradeUnused_Tilemap[] = INCBIN_U16("graphics/trade/unused.bin"); @@ -1934,7 +1934,7 @@ const u32 gCreditsCopyrightEnd_Gfx[] = INCBIN_U32("graphics/credits/fr/the_end_c const u32 gCreditsCopyrightEnd_Tilemap[] = INCBIN_U32("graphics/credits/fr/the_end_copyright.bin.lz"); const u16 g321Start_Pal[] = INCBIN_U16("graphics/link/321start.gbapal"); -const u32 g321Start_Gfx[] = INCBIN_U32("graphics/link/321start_fr.4bpp.lz"); +const u32 g321Start_Gfx[] = INCBIN_U32("graphics/link/french/321start.4bpp.lz"); // poke jump const u16 gPokeJumpBonuses_Pal[] = INCBIN_U16("graphics/pokemon_jump/french/bonuses.gbapal"); @@ -1945,7 +1945,7 @@ const u32 gCreditsCopyrightEnd_Gfx[] = INCBIN_U32("graphics/credits/it/the_end_c const u32 gCreditsCopyrightEnd_Tilemap[] = INCBIN_U32("graphics/credits/it/the_end_copyright.bin.lz"); const u16 g321Start_Pal[] = INCBIN_U16("graphics/link/321start.gbapal"); -const u32 g321Start_Gfx[] = INCBIN_U32("graphics/link/321start_it.4bpp.lz"); +const u32 g321Start_Gfx[] = INCBIN_U32("graphics/link/italian/321start.4bpp.lz"); // poke jump const u16 gPokeJumpBonuses_Pal[] = INCBIN_U16("graphics/pokemon_jump/italian/bonuses.gbapal"); @@ -2053,9 +2053,9 @@ const u32 gConditionSearchResultTilemap[] = INCBIN_U32("graphics/pokenav/conditi // pokenav ribbons list const u16 gMonRibbonListFramePal[] = INCBIN_U16("graphics/pokenav/ribbons/list_bg.gbapal"); #if FRENCH -const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/list_bg_fr.4bpp.lz"); +const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/french/list_bg.4bpp.lz"); #elif ITALIAN -const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/list_bg_it.4bpp.lz"); +const u32 gMonRibbonListFrameTiles[] = INCBIN_U32("graphics/pokenav/ribbons/italian/list_bg.4bpp.lz"); #endif const u32 gMonRibbonListFrameTilemap[] = INCBIN_U32("graphics/pokenav/ribbons/list_bg.bin.lz");