Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-01 06:17:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix compiling Spanish (still doesn't match)

Browse Source
This commit is contained in:
Eduardo Quezada
2025-01-14 13:03:36 -03:00
parent 0aa05fe49e
commit fabf9419ff
12 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/tilesets/secondary/battle_dome/spanish/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
data/tilesets/secondary/shop/spanish/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
graphics/pokenav/condition/spanish/search_results.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

BIN
graphics/pokenav/match_call/spanish/ui.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 248 B

BIN
graphics/pokenav/ribbons/spanish/list_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

2
include/graphics.h
View File

@@ -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[];

2
include/international_string_util.h
View File

@@ -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

2
include/strings.h
View File

@@ -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[];

2
include/tilesets.h
View File

@@ -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];

4
src/data/tilesets/graphics.h
View File

@@ -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] =

14
src/graphics.c
View File

@@ -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");

4
src/international_string_util.c
View File

@@ -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)