Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

宝可导航信息调整

Browse Source 
对战寻呼训练家信息暂时改用小号字体以显示完整
菜单选项由“导航器”改成“导航”
This commit is contained in:
RoamerX 2025-04-26 22:54:47 +08:00
parent 257c6e1f41
commit 75d2beddbb
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pokenav_match_call_data.c
View File

@ -339,7 +339,7 @@ static const struct MatchCallWally sWallyMatchCallHeader =
.mapSec = 0,
.flag = FLAG_ENABLE_WALLY_MATCH_CALL,
.rematchTableIdx = REMATCH_WALLY_VR,
.desc = COMPOUND_STRING("宝可梦迷"),
.desc = COMPOUND_STRING("宝可梦爱好者"),
.textData = sWallyTextScripts,
.locationData = sWallyLocationData
};
@ -380,7 +380,7 @@ static const struct MatchCallStructTrainer sRoxanneMatchCallHeader =
.mapSec = MAPSEC_RUSTBORO_CITY,
.flag = FLAG_ENABLE_ROXANNE_MATCH_CALL,
.rematchTableIdx = REMATCH_ROXANNE,
.desc = COMPOUND_STRING("岩石优等生"),
.desc = COMPOUND_STRING("岩石的优等生"),
.name = NULL,
.textData = sRoxanneTextScripts
};
@ -456,7 +456,7 @@ static const struct MatchCallStructTrainer sWinonaMatchCallHeader =
.mapSec = MAPSEC_FORTREE_CITY,
.flag = FLAG_ENABLE_WINONA_MATCH_CALL,
.rematchTableIdx = REMATCH_WINONA,
.desc = COMPOUND_STRING("世界鸟使者"),
.desc = COMPOUND_STRING("世界的鸟使者"),
.name = NULL,
.textData = sWinonaTextScripts
};
@ -494,7 +494,7 @@ static const struct MatchCallStructTrainer sJuanMatchCallHeader =
.mapSec = MAPSEC_SOOTOPOLIS_CITY,
.flag = FLAG_ENABLE_JUAN_MATCH_CALL,
.rematchTableIdx = REMATCH_JUAN,
.desc = COMPOUND_STRING("迷人花公子"),
.desc = COMPOUND_STRING("迷人花花公子"),
.name = NULL,
.textData = sJuanTextScripts
};

14
src/pokenav_match_call_gfx.c
View File

@ -886,7 +886,7 @@ static void CreateMatchCallList(void)
template.listTop = 1;
template.maxShowed = 8;
template.fillValue = 3;
template.fontId = FONT_NORMAL;
template.fontId = FONT_SMALL;
template.bufferItemFunc = (PokenavListBufferItemFunc)BufferMatchCallNameAndDesc;
template.iconDrawFunc = TryDrawRematchPokeballIcon;
CreatePokenavList(&sMatchCallBgTemplates[2], &template, 2);
@ -1012,14 +1012,14 @@ static void PrintNumberOfBattles(u16 windowId)
static void PrintMatchCallInfoLabel(u16 windowId, const u8 *str, int top)
{
int y = top * 16 + 1;
AddTextPrinterParameterized(windowId, FONT_NARROW, str, 2, y, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(windowId, FONT_SMALL, str, 2, y, TEXT_SKIP_DRAW, NULL);
}
static void PrintMatchCallInfoNumber(u16 windowId, const u8 *str, int top)
{
int x = GetStringRightAlignXOffset(FONT_NARROW, str, 86);
int x = GetStringRightAlignXOffset(FONT_SMALL, str, 86);
int y = top * 16 + 1;
AddTextPrinterParameterized(windowId, FONT_NARROW, str, x, y, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(windowId, FONT_SMALL, str, x, y, TEXT_SKIP_DRAW, NULL);
}
static void PrintMatchCallLocation(struct Pokenav_MatchCallGfx *gfx, int delta)
@ -1033,9 +1033,9 @@ static void PrintMatchCallLocation(struct Pokenav_MatchCallGfx *gfx, int delta)
else
StringCopy(mapName, gText_Unknown);
x = GetStringCenterAlignXOffset(FONT_NARROW, mapName, 88);
x = GetStringCenterAlignXOffset(FONT_SMALL, mapName, 88);
FillWindowPixelBuffer(gfx->locWindowId, PIXEL_FILL(1));
AddTextPrinterParameterized(gfx->locWindowId, FONT_NARROW, mapName, x, 1, 0, NULL);
AddTextPrinterParameterized(gfx->locWindowId, FONT_SMALL, mapName, x, 1, 0, NULL);
}
static void PrintMatchCallSelectionOptions(struct Pokenav_MatchCallGfx *gfx)
@ -1049,7 +1049,7 @@ static void PrintMatchCallSelectionOptions(struct Pokenav_MatchCallGfx *gfx)
if (optionText == MATCH_CALL_OPTION_COUNT)
break;
AddTextPrinterParameterized(gfx->infoBoxWindowId, FONT_NARROW, sMatchCallOptionTexts[optionText], 16, i * 16 + 1, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(gfx->infoBoxWindowId, FONT_SMALL, sMatchCallOptionTexts[optionText], 16, i * 16 + 1, TEXT_SKIP_DRAW, NULL);
}
CopyWindowToVram(gfx->infoBoxWindowId, COPYWIN_GFX);

6
src/pokenav_match_call_list.c
View File

@ -421,12 +421,12 @@ void BufferMatchCallNameAndDesc(struct PokenavMatchCallEntry *matchCallEntry, u8
if (className && trainerName)
{
u8 *str2 = GetStringClearToWidth(str, FONT_NARROW, className, 69);
GetStringClearToWidth(str2, FONT_NARROW, trainerName, 51);
u8 *str2 = GetStringClearToWidth(str, FONT_SMALL, className, 69);
GetStringClearToWidth(str2, FONT_SMALL, trainerName, 51);
}
else
{
GetStringClearToWidth(str, FONT_NARROW, NULL, 120);
GetStringClearToWidth(str, FONT_SMALL, NULL, 120);
}
}

4
src/strings.c
View File

@ -511,7 +511,7 @@ const u8 gText_MultiLink[] = _("多人联机");
const u8 gText_MenuOptionPokedex[] = _("图鉴");
const u8 gText_MenuOptionPokemon[] = _("宝可梦");
const u8 gText_MenuOptionBag[] = _("包包");
const u8 gText_MenuOptionPokenav[] = _("导航器");
const u8 gText_MenuOptionPokenav[] = _("导航");
const u8 gText_Blank[] = _("");
const u8 gText_MenuOptionSave[] = _("保存");
const u8 gText_MenuOptionOption[] = _("设置");
@ -1017,7 +1017,7 @@ const u8 gText_UpdatedTime[] = _("更新时间"); // Unused
const u8 gText_MenuPokedex[] = _("图鉴");
const u8 gText_MenuPokemon[] = _("宝可梦");
const u8 gText_MenuBag[] = _("包包");
const u8 gText_MenuPokenav[] = _("导航器");
const u8 gText_MenuPokenav[] = _("导航");
const u8 gText_MenuPlayer[] = _("{PLAYER}");
const u8 gText_MenuSave[] = _("保存");
const u8 gText_MenuOption[] = _("设置");