Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-14 05:15:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

(68/654)

Browse Source
This commit is contained in:
Eduardo Quezada
2022-08-02 14:03:42 -04:00
parent 1b30bccb47
commit f2f74b94d2
19 changed files with 125 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_pyramid_bag.c
View File

@@ -1170,7 +1170,7 @@ static void ShowNumToToss(void)
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_xVar1);
DrawTossNumberWindow(WIN_TOSS_NUM);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0x28);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 40);
AddTextPrinterParameterized(WIN_TOSS_NUM, FONT_NORMAL, gStringVar4, x, 2, 0, NULL);
}
@@ -1179,7 +1179,7 @@ static void UpdateNumToToss(s16 num)
s32 x;
ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_xVar1);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0x28);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 40);
AddTextPrinterParameterized(WIN_TOSS_NUM, FONT_NORMAL, gStringVar4, x, 2, 0, NULL);
}

2
src/battle_records.c
View File

@@ -279,7 +279,7 @@ static void PrintLinkBattleWinsLossesDraws(struct LinkBattleRecord *records)
ConvertIntToDecimalStringN(gStringVar3, GetGameStat(GAME_STAT_LINK_BATTLE_DRAWS), STR_CONV_MODE_LEFT_ALIGN, 4);
StringExpandPlaceholders(gStringVar4, gText_TotalRecordWLD);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0xD0);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 208);
AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x, 0x11, 0, NULL);
}

4
src/berry_blender.c
View File

@@ -1661,7 +1661,7 @@ static void PrintPlayerNames(void)
text[0] = EOS;
StringCopy(text, gLinkPlayers[sBerryBlender->arrowIdToPlayerId[i]].name);
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, text, 0x38);
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, text, 56);
if (playerId == sBerryBlender->arrowIdToPlayerId[i])
Blender_AddTextPrinter(i, text, xPos, 1, 0, 2); // Highlight player's name in red
@@ -3555,7 +3555,7 @@ static bool8 PrintBlendingResults(void)
u16 minutes, seconds;
u8 *txtPtr;
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, sText_BlendingResults, 0xA8);
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, sText_BlendingResults, 168);
Blender_AddTextPrinter(5, sText_BlendingResults, xPos, 1, TEXT_SKIP_DRAW, 0);
if (sBerryBlender->numPlayers == BLENDER_MAX_PLAYERS)

2
src/berry_tag_screen.c
View File

@@ -404,7 +404,7 @@ static void AddBerryTagTextToBg0(void)
{
memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2]));
FillWindowPixelBuffer(WIN_BERRY_TAG, PIXEL_FILL(15));
PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(FONT_NORMAL, gText_BerryTag, 0x40), 1, 0, 1);
PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(FONT_NORMAL, gText_BerryTag, 64), 1, 0, 1);
PutWindowTilemap(WIN_BERRY_TAG);
ScheduleBgCopyTilemapToVram(0);
}

4
src/cable_club.c
View File

@@ -1225,7 +1225,11 @@ void Task_WaitForLinkPlayerConnection(u8 taskId)
struct Task *task = &gTasks[taskId];
task->tTimer++;
#if ENGLISH
if (task->tTimer > 300)
#elif FRENCH
if (task->tTimer > 480)
#endif
{
CloseLink();
SetMainCallback2(CB2_LinkError);

2
src/field_region_map.c
View File

@@ -151,7 +151,7 @@ static void FieldUpdateRegionMap(void)
break;
case 1:
DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x27, 0xd);
offset = GetStringCenterAlignXOffset(FONT_NORMAL, gText_Hoenn, 0x38);
offset = GetStringCenterAlignXOffset(FONT_NORMAL, gText_Hoenn, 56);
AddTextPrinterParameterized(1, FONT_NORMAL, gText_Hoenn, offset, 1, 0, NULL);
ScheduleBgCopyTilemapToVram(0);
DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x27, 0xd);

4
src/hall_of_fame.c
View File

@@ -1109,7 +1109,7 @@ static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
{
FillWindowPixelBuffer(0, PIXEL_FILL(0));
PutWindowTilemap(0);
AddTextPrinterParameterized3(0, FONT_NORMAL, GetStringCenterAlignXOffset(FONT_NORMAL, gText_WelcomeToHOF, 0xD0), 1, sMonInfoTextColors, 0, gText_WelcomeToHOF);
AddTextPrinterParameterized3(0, FONT_NORMAL, GetStringCenterAlignXOffset(FONT_NORMAL, gText_WelcomeToHOF, 208), 1, sMonInfoTextColors, 0, gText_WelcomeToHOF);
CopyWindowToVram(0, COPYWIN_FULL);
}
@@ -1153,7 +1153,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
text[POKEMON_NAME_LENGTH] = EOS;
if (currMon->species == SPECIES_EGG)
{
width = GetStringCenterAlignXOffset(FONT_NORMAL, text, 0xD0);
width = GetStringCenterAlignXOffset(FONT_NORMAL, text, 208);
AddTextPrinterParameterized3(0, FONT_NORMAL, width, 1, sMonInfoTextColors, TEXT_SKIP_DRAW, text);
CopyWindowToVram(0, COPYWIN_FULL);
}

6
src/item_menu.c
View File

@@ -1195,7 +1195,7 @@ static void PrintItemQuantity(u8 windowId, s16 quantity)
u8 numDigits = (gBagPosition.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS;
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, numDigits);
StringExpandPlaceholders(gStringVar4, gText_xVar1);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0x28), 2, 0, 0);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 40), 2, 0, 0);
}
// Prints the quantity of items to be sold and the amount that would be earned
@@ -2416,11 +2416,11 @@ static void PrintPocketNames(const u8 *pocketName1, const u8 *pocketName2)
window.height = 2;
windowId = AddWindow(&window);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
offset = GetStringCenterAlignXOffset(FONT_NORMAL, pocketName1, 0x40);
offset = GetStringCenterAlignXOffset(FONT_NORMAL, pocketName1, 64);
BagMenu_Print(windowId, FONT_NORMAL, pocketName1, offset, 1, 0, 0, TEXT_SKIP_DRAW, COLORID_POCKET_NAME);
if (pocketName2)
{
offset = GetStringCenterAlignXOffset(FONT_NORMAL, pocketName2, 0x40);
offset = GetStringCenterAlignXOffset(FONT_NORMAL, pocketName2, 64);
BagMenu_Print(windowId, FONT_NORMAL, pocketName2, offset + 0x40, 1, 0, 0, TEXT_SKIP_DRAW, COLORID_POCKET_NAME);
}
CpuCopy32((u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gBagMenu->pocketNameBuffer, sizeof(gBagMenu->pocketNameBuffer));

4
src/menu_specialized.c
View File

@@ -759,7 +759,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove)
FillWindowPixelBuffer(0, PIXEL_FILL(1));
str = gText_MoveRelearnerBattleMoves;
x = GetStringCenterAlignXOffset(FONT_NORMAL, str, 0x80);
x = GetStringCenterAlignXOffset(FONT_NORMAL, str, 128);
AddTextPrinterParameterized(0, FONT_NORMAL, str, x, 1, TEXT_SKIP_DRAW, NULL);
str = gText_MoveRelearnerPP;
@@ -820,7 +820,7 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove)
MoveRelearnerShowHideHearts(chosenMove);
FillWindowPixelBuffer(1, PIXEL_FILL(1));
str = gText_MoveRelearnerContestMovesTitle;
x = GetStringCenterAlignXOffset(FONT_NORMAL, str, 0x80);
x = GetStringCenterAlignXOffset(FONT_NORMAL, str, 128);
AddTextPrinterParameterized(1, FONT_NORMAL, str, x, 1, TEXT_SKIP_DRAW, NULL);
str = gText_MoveRelearnerAppeal;

6
src/player_pc.c
View File

@@ -691,7 +691,11 @@ static void Mailbox_DrawMailboxMenu(u8 taskId)
{
u8 windowId = MailboxMenu_AddWindow(MAILBOXWIN_TITLE);
MailboxMenu_AddWindow(MAILBOXWIN_LIST);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Mailbox, GetStringCenterAlignXOffset(FONT_NORMAL, gText_Mailbox, 0x40), 1, 0, NULL);
#if ENGLISH
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Mailbox, GetStringCenterAlignXOffset(FONT_NORMAL, gText_Mailbox, 64), 1, 0, NULL);
#elif FRENCH
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Mailbox, GetStringCenterAlignXOffset(FONT_NORMAL, gText_Mailbox, gWindows[windowId].window.width * 8), 1, 0, NULL);
#endif
ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].tListTaskId = MailboxMenu_CreateList(&gPlayerPCItemPageInfo);
MailboxMenu_AddScrollArrows(&gPlayerPCItemPageInfo);

2
src/pokeblock.c
View File

@@ -700,7 +700,7 @@ static void DrawPokeblockMenuTitleText(void)
u8 i;
const u8 *itemName = ItemId_GetName(ITEM_POKEBLOCK_CASE);
PrintOnPokeblockWindow(WIN_TITLE, itemName, GetStringCenterAlignXOffset(FONT_NORMAL, itemName, 0x48));
PrintOnPokeblockWindow(WIN_TITLE, itemName, GetStringCenterAlignXOffset(FONT_NORMAL, itemName, 72));
PrintOnPokeblockWindow(WIN_SPICY, gText_Spicy, 0);
PrintOnPokeblockWindow(WIN_DRY, gText_Dry, 0);

6
src/pokedex.c
View File

@@ -3775,7 +3775,7 @@ static void Task_LoadSizeScreen(u8 taskId)
StringCopy(string, gText_SizeComparedTo);
StringAppend(string, gSaveBlock2Ptr->playerName);
PrintInfoScreenText(string, GetStringCenterAlignXOffset(FONT_NORMAL, string, 0xF0), 0x79);
PrintInfoScreenText(string, GetStringCenterAlignXOffset(FONT_NORMAL, string, 240), 0x79);
gMain.state++;
}
break;
@@ -4123,7 +4123,7 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
const u8 *description;
if (newEntry)
PrintInfoScreenText(gText_PokedexRegistration, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PokedexRegistration, 0xF0), 0);
PrintInfoScreenText(gText_PokedexRegistration, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PokedexRegistration, 240), 0);
if (value == 0)
value = NationalToHoennOrder(num);
else
@@ -4177,7 +4177,7 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
description = gPokedexEntries[num].description;
else
description = sExpandedPlaceholder_PokedexDescription;
PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, 0xF0), 0x5F);
PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, 240), 0x5F);
}
static void PrintMonHeight(u16 height, u8 left, u8 top)

11
src/pokemon_jump.c
View File

@@ -6,6 +6,9 @@
#include "decompress.h"
#include "dynamic_placeholder_text_util.h"
#include "event_data.h"
#if FRENCH
#include "graphics.h"
#endif
#include "international_string_util.h"
#include "item.h"
#include "link.h"
@@ -3053,9 +3056,11 @@ static const u16 sVenusaur_Pal[] = INCBIN_U16("graphics/pokemon_jump/venusaur.gb
static const u32 sVenusaur_Gfx[] = INCBIN_U32("graphics/pokemon_jump/venusaur.4bpp.lz");
static const u32 sVenusaur_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/venusaur.bin.lz");
#if ENGLISH
static const u16 sBonuses_Pal[] = INCBIN_U16("graphics/pokemon_jump/bonuses.gbapal");
static const u32 sBonuses_Gfx[] = INCBIN_U32("graphics/pokemon_jump/bonuses.4bpp.lz");
static const u32 sBonuses_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/bonuses.bin.lz");
#endif
static const struct BgTemplate sBgTemplates[] =
{
@@ -3189,9 +3194,15 @@ static void LoadPokeJumpGfx(void)
LoadPalette(sVenusaur_Pal, 0x30, 0x20);
DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Tilemap, 0, 0, 1);
#if ENGLISH
LoadPalette(sBonuses_Pal, 0x10, 0x20);
DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Tilemap, 0, 0, 1);
#elif FRENCH
LoadPalette(gPokeJumpBonuses_Pal, 0x10, 0x20);
DecompressAndCopyTileDataToVram(BG_BONUSES, gPokeJumpBonuses_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_BONUSES, gPokeJumpBonuses_Tilemap, 0, 0, 1);
#endif
LoadPalette(sInterface_Pal, 0x20, 0x20);
SetBgTilemapBuffer(BG_INTERFACE, sPokemonJumpGfx->tilemapBuffer);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 0x20, 0x20);

16
src/pokemon_summary_screen.c
View File

@@ -591,7 +591,11 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.bg = 0,
.tilemapLeft = 11,
.tilemapTop = 9,
#if ENGLISH
.width = 18,
#elif FRENCH
.width = 19,
#endif
.height = 4,
.paletteNum = 6,
.baseBlock = 485,
@@ -603,7 +607,11 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 18,
.height = 6,
.paletteNum = 6,
#if ENGLISH
.baseBlock = 557,
#elif FRENCH
.baseBlock = 561,
#endif
},
};
static const struct WindowTemplate sPageSkillsTemplate[] =
@@ -3677,7 +3685,11 @@ static void PrintNewMoveDetailsOrCancelText(void)
static void AddAndFillMoveNamesWindow(void)
{
u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES);
#if ENGLISH
FillWindowPixelRect(windowId, PIXEL_FILL(0), 0, 66, 72, 16);
#elif FRENCH
FillWindowPixelRect(windowId, PIXEL_FILL(0), 0, 65, 72, 15);
#endif
CopyWindowToVram(windowId, COPYWIN_GFX);
}
@@ -3879,7 +3891,7 @@ static u8 LoadMonGfxAndSprite(struct Pokemon *mon, s16 *state)
summary->species2,
summary->pid);
else
HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2],
HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2],
gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT],
summary->species2,
summary->pid);
@@ -3891,7 +3903,7 @@ static u8 LoadMonGfxAndSprite(struct Pokemon *mon, s16 *state)
if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == SUMMARY_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE)
HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2],
gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT],
summary->species2,
summary->species2,
summary->pid);
else
HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[summary->species2],

40
src/reset_rtc_screen.c
View File

@@ -243,28 +243,44 @@ static void SpriteCB_Cursor_UpOrRight(struct Sprite *sprite)
sprite->invisible = FALSE;
sprite->animNum = ARROW_UP;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 53;
#elif FRENCH
sprite->x = 56;
#endif
sprite->y = 68;
break;
case SELECTION_HOURS:
sprite->invisible = FALSE;
sprite->animNum = ARROW_UP;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 86;
#elif FRENCH
sprite->x = 92;
#endif
sprite->y = 68;
break;
case SELECTION_MINS:
sprite->invisible = FALSE;
sprite->animNum = ARROW_UP;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 101;
#elif FRENCH
sprite->x = 107;
#endif
sprite->y = 68;
break;
case SELECTION_SECS:
sprite->invisible = FALSE;
sprite->animNum = ARROW_UP;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 116;
#elif FRENCH
sprite->x = 122;
#endif
sprite->y = 68;
break;
case SELECTION_CONFIRM:
@@ -293,28 +309,44 @@ static void SpriteCB_Cursor_Down(struct Sprite *sprite)
sprite->invisible = FALSE;
sprite->animNum = ARROW_DOWN;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 53;
#elif FRENCH
sprite->x = 56;
#endif
sprite->y = 92;
break;
case SELECTION_HOURS:
sprite->invisible = FALSE;
sprite->animNum = ARROW_DOWN;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 86;
#elif FRENCH
sprite->x = 92;
#endif
sprite->y = 92;
break;
case SELECTION_MINS:
sprite->invisible = FALSE;
sprite->animNum = ARROW_DOWN;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 101;
#elif FRENCH
sprite->x = 107;
#endif
sprite->y = 92;
break;
case SELECTION_SECS:
sprite->invisible = FALSE;
sprite->animNum = ARROW_DOWN;
sprite->animDelayCounter = 0;
#if ENGLISH
sprite->x = 116;
#elif FRENCH
sprite->x = 122;
#endif
sprite->y = 92;
break;
case SELECTION_CONFIRM:
@@ -335,12 +367,20 @@ static void CreateCursor(u8 taskId)
LoadSpritePalette(&sSpritePalette_Arrow);
#if ENGLISH
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Arrow, 53, 68, 0);
#elif FRENCH
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Arrow, 56, 68, 0);
#endif
gSprites[spriteId].callback = SpriteCB_Cursor_UpOrRight;
gSprites[spriteId].sTaskId = taskId;
gSprites[spriteId].sState = -1;
#if ENGLISH
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Arrow, 53, 68, 0);
#elif FRENCH
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Arrow, 56, 68, 0);
#endif
gSprites[spriteId].callback = SpriteCB_Cursor_Down;
gSprites[spriteId].sTaskId = taskId;
gSprites[spriteId].sState = -1;

27
src/roulette.c
View File

@@ -456,12 +456,21 @@ static const struct WindowTemplate sWindowTemplates[] =
{
{
.bg = 0,
#if ENGLISH
.tilemapLeft = 3,
.tilemapTop = 15,
.width = 24,
.height = 4,
.paletteNum = 15,
.baseBlock = 0xC5
#elif FRENCH
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 26,
.height = 4,
.paletteNum = 15,
.baseBlock = 0xBD
#endif
},
#ifdef UBFIX
DUMMY_WIN_TEMPLATE,
@@ -2323,6 +2332,7 @@ static void UpdateWheelPosition(void)
}
static const u8 sFiller[3] = {};
#if ENGLISH
static const u16 sShadow_Pal[] = INCBIN_U16("graphics/roulette/shadow.gbapal");
static const u16 sBall_Pal[] = INCBIN_U16("graphics/roulette/ball.gbapal");
static const u16 sBallCounter_Pal[] = INCBIN_U16("graphics/roulette/ball_counter.gbapal");
@@ -2339,6 +2349,7 @@ static const u16 sUnused1_Pal[] = INCBIN_U16("graphics/roulette/unused_1.gbapal"
static const u16 sUnused2_Pal[] = INCBIN_U16("graphics/roulette/unused_2.gbapal");
static const u16 sUnused3_Pal[] = INCBIN_U16("graphics/roulette/unused_3.gbapal");
static const u16 sUnused4_Pal[] = INCBIN_U16("graphics/roulette/unused_4.gbapal");
#endif
static const u32 sBall_Gfx[] = INCBIN_U32("graphics/roulette/ball.4bpp.lz");
static const u32 sBallCounter_Gfx[] = INCBIN_U32("graphics/roulette/ball_counter.4bpp.lz");
static const u32 sShroomishTaillow_Gfx[] = INCBIN_U32("graphics/roulette/roulette_tilt.4bpp.lz");
@@ -2349,6 +2360,7 @@ static const u32 sCursor_Gfx[] = INCBIN_U32("graphics/roulette/cursor.4bpp.lz");
static const struct SpritePalette sSpritePalettes[] =
{
#if ENGLISH
{ .data = sShadow_Pal, .tag = PALTAG_SHADOW },
{ .data = sBall_Pal, .tag = PALTAG_BALL },
{ .data = sBallCounter_Pal, .tag = PALTAG_BALL_COUNTER },
@@ -2362,6 +2374,21 @@ static const struct SpritePalette sSpritePalettes[] =
{ .data = sSkitty_Pal, .tag = PALTAG_SKITTY },
{ .data = sMakuhita_Pal, .tag = PALTAG_MAKUHITA },
{}
#elif FRENCH
{ .data = gRouletteShadow_Pal, .tag = PALTAG_SHADOW },
{ .data = gRouletteBall_Pal, .tag = PALTAG_BALL },
{ .data = gRouletteBallCounter_Pal, .tag = PALTAG_BALL_COUNTER },
{ .data = gRouletteCursor_Pal, .tag = PALTAG_CURSOR },
{ .data = gRouletteCredit_Pal, .tag = PALTAG_INTERFACE },
{ .data = gRouletteShroomish_Pal, .tag = PALTAG_SHROOMISH },
{ .data = gRouletteTaillow_Pal, .tag = PALTAG_TAILLOW },
{ .data = gRouletteGridIcons_Pal, .tag = PALTAG_GRID_ICONS },
{ .data = gRouletteWynaut_Pal, .tag = PALTAG_WYNAUT },
{ .data = gRouletteAzurill_Pal, .tag = PALTAG_AZURILL },
{ .data = gRouletteSkitty_Pal, .tag = PALTAG_SKITTY },
{ .data = gRouletteMakuhita_Pal, .tag = PALTAG_MAKUHITA },
{}
#endif
};
static const struct OamData sOam_GridHeader =

8
src/starter_choose.c
View File

@@ -592,16 +592,16 @@ static void CreateStarterPokemonLabel(u8 selection)
FillWindowPixelBuffer(sStarterLabelWindowId, PIXEL_FILL(0));
#if ENGLISH
width = GetStringCenterAlignXOffset(FONT_NARROW, categoryText, 0x68);
width = GetStringCenterAlignXOffset(FONT_NARROW, categoryText, 104);
AddTextPrinterParameterized3(sStarterLabelWindowId, FONT_NARROW, width, 1, sTextColors, 0, categoryText);
width = GetStringCenterAlignXOffset(FONT_NORMAL, speciesName, 0x68);
width = GetStringCenterAlignXOffset(FONT_NORMAL, speciesName, 104);
AddTextPrinterParameterized3(sStarterLabelWindowId, FONT_NORMAL, width, 17, sTextColors, 0, speciesName);
#elif FRENCH
width = GetStringCenterAlignXOffset(FONT_NORMAL, speciesName, 0x68);
width = GetStringCenterAlignXOffset(FONT_NORMAL, speciesName, 104);
AddTextPrinterParameterized3(sStarterLabelWindowId, FONT_NORMAL, width, 1, sTextColors, 0, speciesName);
width = GetStringCenterAlignXOffset(FONT_NARROW, categoryText, 0x68);
width = GetStringCenterAlignXOffset(FONT_NARROW, categoryText, 104);
AddTextPrinterParameterized3(sStarterLabelWindowId, FONT_NARROW, width, 17, sTextColors, 0, categoryText);
#endif

2
src/trainer_hill.c
View File

@@ -588,7 +588,7 @@ void PrintOnTrainerHillRecordsWindow(void)
SetUpDataStruct();
FillWindowPixelBuffer(0, PIXEL_FILL(0));
x = GetStringCenterAlignXOffset(FONT_NORMAL, gText_TimeBoard, 0xD0);
x = GetStringCenterAlignXOffset(FONT_NORMAL, gText_TimeBoard, 208);
AddTextPrinterParameterized3(0, FONT_NORMAL, x, 2, sRecordWinColors, TEXT_SKIP_DRAW, gText_TimeBoard);
y = 18;

2
src/wireless_communication_status_screen.c
View File

@@ -236,7 +236,7 @@ static void PrintHeaderTexts(void)
FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(1, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0));
WCSS_AddTextPrinterParameterized(0, FONT_NORMAL, sHeaderTexts[0], GetStringCenterAlignXOffset(FONT_NORMAL, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN);
WCSS_AddTextPrinterParameterized(0, FONT_NORMAL, sHeaderTexts[0], GetStringCenterAlignXOffset(FONT_NORMAL, sHeaderTexts[0], 192), 6, COLORMODE_GREEN);
for (i = 0; i < (int)ARRAY_COUNT(*sHeaderTexts) - 1; i++)
{
WCSS_AddTextPrinterParameterized(1, FONT_NORMAL, sHeaderTexts[i + 1], 0, 30 * i + 8, COLORMODE_WHITE_LGRAY);