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-19 23:53:54 +08:00
parent dce4c9e6a6
commit fa33ee6283
4 changed files with 157 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/FortreeCity_DecorationShop/scripts.inc
View File

@ -57,5 +57,5 @@ FortreeCity_DecorationShop_Text_MerchandiseSentToPC:
.string "在这儿买的商品\n都会送到自己的电脑里，\p太奇妙了！如果也能让他们\n把我那样送回家就好了。$"
FortreeCity_DecorationShop_Text_BuyingDeskForDolls:
.string "我要买张漂亮的桌子\n放我可爱的玩偶，\p否则我装扮我的\n秘密基地的时候我的玩偶\l会弄脏，还可能被戳坏。$"
.string "我要买张漂亮桌子\n放我可爱的玩偶，\p否则我装扮我的\n秘密基地的时候我的玩偶\l会弄脏，还可能被戳坏。$"

158
src/field_specials.c
View File

@ -2431,89 +2431,89 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH]
},
[SCROLL_MULTI_GLASS_WORKSHOP_VENDOR] =
{
COMPOUND_STRING("BLUE FLUTE"),
COMPOUND_STRING("YELLOW FLUTE"),
COMPOUND_STRING("RED FLUTE"),
COMPOUND_STRING("WHITE FLUTE"),
COMPOUND_STRING("BLACK FLUTE"),
COMPOUND_STRING("PRETTY CHAIR"),
COMPOUND_STRING("PRETTY DESK"),
COMPOUND_STRING("蓝色玻璃哨"),
COMPOUND_STRING("黄色玻璃哨"),
COMPOUND_STRING("红色玻璃哨"),
COMPOUND_STRING("白色玻璃哨"),
COMPOUND_STRING("黑色玻璃哨"),
COMPOUND_STRING("漂亮凳子"),
COMPOUND_STRING("漂亮桌子"),
gText_Exit
},
[SCROLL_MULTI_POKEMON_FAN_CLUB_RATER] =
{
COMPOUND_STRING("0 pts"),
COMPOUND_STRING("10 pts"),
COMPOUND_STRING("20 pts"),
COMPOUND_STRING("30 pts"),
COMPOUND_STRING("40 pts"),
COMPOUND_STRING("50 pts"),
COMPOUND_STRING("60 pts"),
COMPOUND_STRING("70 pts"),
COMPOUND_STRING("80 pts"),
COMPOUND_STRING("90 pts"),
COMPOUND_STRING("100 pts"),
COMPOUND_STRING("1点"),
COMPOUND_STRING("10点"),
COMPOUND_STRING("20点"),
COMPOUND_STRING("30点"),
COMPOUND_STRING("40点"),
COMPOUND_STRING("50点"),
COMPOUND_STRING("60点"),
COMPOUND_STRING("70点"),
COMPOUND_STRING("80点"),
COMPOUND_STRING("90点"),
COMPOUND_STRING("100点"),
COMPOUND_STRING("?")
},
[SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1] =
{
COMPOUND_STRING("KISS POSTER{CLEAR_TO 0x5E}16BP"),
COMPOUND_STRING("KISS CUSHION{CLEAR_TO 0x5E}32BP"),
COMPOUND_STRING("SMOOCHUM DOLL{CLEAR_TO 0x5E}32BP"),
COMPOUND_STRING("TOGEPI DOLL{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("MEOWTH DOLL{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("CLEFAIRY DOLL{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("DITTO DOLL{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("CYNDAQUIL DOLL{CLEAR_TO 0x5E}80BP"),
COMPOUND_STRING("CHIKORITA DOLL{CLEAR_TO 0x5E}80BP"),
COMPOUND_STRING("TOTODILE DOLL{CLEAR_TO 0x5E}80BP"),
COMPOUND_STRING("飞吻海报{CLEAR_TO 0x5E}16BP"),
COMPOUND_STRING("亲吻坐垫{CLEAR_TO 0x5E}32BP"),
COMPOUND_STRING("迷唇娃玩偶{CLEAR_TO 0x5E}32BP"),
COMPOUND_STRING("波克比玩偶{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("喵喵玩偶{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("皮皮玩偶{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("百变怪{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("火球鼠玩偶{CLEAR_TO 0x5E}80BP"),
COMPOUND_STRING("菊草叶玩偶{CLEAR_TO 0x5E}80BP"),
COMPOUND_STRING("小锯鳄玩偶{CLEAR_TO 0x5E}80BP"),
gText_Exit
},
[SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2] =
{
COMPOUND_STRING("LAPRAS DOLL{CLEAR_TO 0x58}128BP"),
COMPOUND_STRING("SNORLAX DOLL{CLEAR_TO 0x58}128BP"),
COMPOUND_STRING("VENUSAUR DOLL{CLEAR_TO 0x58}256BP"),
COMPOUND_STRING("CHARIZARD DOLL{CLEAR_TO 0x58}256BP"),
COMPOUND_STRING("BLASTOISE DOLL{CLEAR_TO 0x58}256BP"),
COMPOUND_STRING("拉普拉斯玩偶{CLEAR_TO 0x58}128BP"),
COMPOUND_STRING("卡比兽玩偶{CLEAR_TO 0x58}128BP"),
COMPOUND_STRING("妙蛙花玩偶{CLEAR_TO 0x58}256BP"),
COMPOUND_STRING("喷火龙玩偶{CLEAR_TO 0x58}256BP"),
COMPOUND_STRING("水箭龟玩偶{CLEAR_TO 0x58}256BP"),
gText_Exit
},
[SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR] =
{
COMPOUND_STRING("PROTEIN{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("CALCIUM{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("IRON{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("ZINC{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("CARBOS{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("HP UP{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("攻击增强剂{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("特攻增强剂{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("防御增强剂{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("特防增强剂{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("速度增强剂{CLEAR_TO 0x64}1BP"),
COMPOUND_STRING("HP增强剂{CLEAR_TO 0x64}1BP"),
gText_Exit
},
[SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR] =
{
COMPOUND_STRING("LEFTOVERS{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("WHITE HERB{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("QUICK CLAW{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("MENTAL HERB{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("BRIGHTPOWDER{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("CHOICE BAND{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("KING'S ROCK{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("FOCUS BAND{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("SCOPE LENS{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("吃剩的东西{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("白色香草{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("先制之爪{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("心灵香草{CLEAR_TO 0x5E}48BP"),
COMPOUND_STRING("光粉{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("讲究头带{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("王者之证{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("气势头带{CLEAR_TO 0x5E}64BP"),
COMPOUND_STRING("焦点镜{CLEAR_TO 0x5E}64BP"),
gText_Exit
},
[SCROLL_MULTI_BERRY_POWDER_VENDOR] =
{
COMPOUND_STRING("ENERGYPOWDER{CLEAR_TO 114}{FONT_SMALL}50"),
COMPOUND_STRING("ENERGY ROOT{CLEAR_TO 114}{FONT_SMALL}80"),
COMPOUND_STRING("HEAL POWDER{CLEAR_TO 114}{FONT_SMALL}50"),
COMPOUND_STRING("REVIVAL HERB{CLEAR_TO 108}{FONT_SMALL}300"),
COMPOUND_STRING("PROTEIN{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("IRON{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("CARBOS{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("CALCIUM{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("ZINC{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("HP UP{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("PP UP{CLEAR_TO 99}{FONT_SMALL}3,000"),
COMPOUND_STRING("元气粉{CLEAR_TO 114}{FONT_SMALL}50"),
COMPOUND_STRING("元气根{CLEAR_TO 114}{FONT_SMALL}80"),
COMPOUND_STRING("万能粉{CLEAR_TO 114}{FONT_SMALL}50"),
COMPOUND_STRING("复活草{CLEAR_TO 108}{FONT_SMALL}300"),
COMPOUND_STRING("攻击增强剂{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("防御增强剂{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("速度增强剂{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("特攻增强剂{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("特防增强剂{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("HP增强剂{CLEAR_TO 99}{FONT_SMALL}1,000"),
COMPOUND_STRING("PP提升剂{CLEAR_TO 99}{FONT_SMALL}3,000"),
gText_Exit
},
[SCROLL_MULTI_BF_RECEPTIONIST] =
@ -2531,30 +2531,30 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH]
},
[SCROLL_MULTI_BF_MOVE_TUTOR_1] =
{
COMPOUND_STRING("SOFTBOILED{CLEAR_TO 0x4E}16BP"),
COMPOUND_STRING("SEISMIC TOSS{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("DREAM EATER{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("MEGA PUNCH{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("MEGA KICK{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("BODY SLAM{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("ROCK SLIDE{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("COUNTER{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("THUNDER WAVE{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("SWORDS DANCE{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("生蛋{CLEAR_TO 0x4E}16BP"),
COMPOUND_STRING("地球上投{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("食梦{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("百万吨重拳{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("百万吨重踢{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("泰山压顶{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("岩崩{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("双倍奉还{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("电磁波{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("剑舞{CLEAR_TO 0x4E}48BP"),
gText_Exit
},
[SCROLL_MULTI_BF_MOVE_TUTOR_2] =
{
COMPOUND_STRING("DEFENSE CURL{CLEAR_TO 0x4E}16BP"),
COMPOUND_STRING("SNORE{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("MUD-SLAP{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("SWIFT{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("ICY WIND{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("ENDURE{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("PSYCH UP{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("ICE PUNCH{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("THUNDERPUNCH{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("FIRE PUNCH{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("变圆{CLEAR_TO 0x4E}16BP"),
COMPOUND_STRING("打鼾{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("掷泥{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("高速星星{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("冰冻之风{CLEAR_TO 0x4E}24BP"),
COMPOUND_STRING("挺住{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("自我暗示{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("冰冻拳{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("雷电拳{CLEAR_TO 0x4E}48BP"),
COMPOUND_STRING("火焰拳{CLEAR_TO 0x4E}48BP"),
gText_Exit
},
[SCROLL_MULTI_SS_TIDAL_DESTINATION] =

144
src/frontier_util.c
View File

@ -104,12 +104,12 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.objEventGfx = OBJ_EVENT_GFX_ANABEL,
.isFemale = TRUE,
.lostTexts = {
COMPOUND_STRING("Okay, I understand…"), //Silver
COMPOUND_STRING("Thank you…") //Gold
COMPOUND_STRING("好的，我知道了……"), //Silver
COMPOUND_STRING("谢谢你……") //Gold
},
.wonTexts = {
COMPOUND_STRING("It's very disappointing…"), //Silver
COMPOUND_STRING("I'm terribly sorry…") //Gold
COMPOUND_STRING("好令人失望……"), //Silver
COMPOUND_STRING("我真的很抱歉……") //Gold
},
.battledBit = {1 << 0, 1 << 1},
.streakAppearances = {35, 70, 35, 1},
@ -121,17 +121,17 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.isFemale = FALSE,
.lostTexts = {
COMPOUND_STRING(
"Grr…\n"
"What the…"), //Silver
"呃……\n"
"怎么回……"), //Silver
COMPOUND_STRING(
"Ahahaha!\n"
"You're inspiring!") //Gold
"啊哈哈！\n"
"你给我带来了灵感！") //Gold
},
.wonTexts = {
COMPOUND_STRING(
"Ahahaha! Aren't you embarrassed?\n"
"Everyone's watching!"), //Silver
COMPOUND_STRING("My DOME ACE title isn't just for show!") //Gold
"啊哈哈！你不尴尬吗？\n"
"所有人都在看着呢！"), //Silver
COMPOUND_STRING("我巨蛋超级巨星\n可不是浪得虚名！") //Gold
},
.battledBit = {1 << 2, 1 << 3},
.streakAppearances = {1, 2, 5, 0},
@ -143,19 +143,19 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.isFemale = FALSE,
.lostTexts = {
COMPOUND_STRING(
"Ah…\n"
"Now this is something else…"), //Silver
"啊……\n"
"这下可不一样了。"), //Silver
COMPOUND_STRING(
"Gwah!\n"
"Hahahaha!") //Gold
"咕啊！\n"
"哈哈哈哈！") //Gold
},
.wonTexts = {
COMPOUND_STRING(
"Your POKéMON are wimpy because\n"
"you're wimpy as a TRAINER!"), //Silver
"你的宝可梦之所以弱小，\n"
"是因为你是个弱小的训练家。"), //Silver
COMPOUND_STRING(
"Gwahahaha!\n"
"My brethren, we have nothing to fear!") //Gold
"唔哈哈哈！\n"
"弟兄们，我们无所畏惧！") //Gold
},
.battledBit = {1 << 4, 1 << 5},
.streakAppearances = {21, 42, 21, 1},
@ -167,19 +167,19 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.isFemale = TRUE,
.lostTexts = {
COMPOUND_STRING(
"No way!\n"
"Good job!"), //Silver
"没想到！\n"
"好样的！"), //Silver
COMPOUND_STRING(
"Huh?\n"
"Are you serious?!") //Gold
"啊？\n"
"你认真的？！") //Gold
},
.wonTexts = {
COMPOUND_STRING(
"Oh, come on!\n"
"You have to try harder than that!"), //Silver
"喂，加把劲！\n"
"你得做得更好才行！"), //Silver
COMPOUND_STRING(
"Heheh!\n"
"What did you expect?") //Gold
"嘿嘿嘿！\n"
"你在期待什么？") //Gold
},
.battledBit = {1 << 6, 1 << 7},
.streakAppearances = {28, 56, 28, 1},
@ -191,17 +191,17 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.isFemale = FALSE,
.lostTexts = {
COMPOUND_STRING(
"Good job!\n"
"You know what you're doing!"), //Silver
COMPOUND_STRING("What happened here?") //Gold
"好样的！\n"
"你知道自己在做什么！"), //Silver
COMPOUND_STRING("这里发生了什么？") //Gold
},
.wonTexts = {
COMPOUND_STRING(
"Way to work!\n"
"That was a good lesson, eh?"), //Silver
"干得好！\n"
"这也是不错的一课，对吧？"), //Silver
COMPOUND_STRING(
"Hey, hey, hey!\n"
"You're finished already?") //Gold
"喂，喂，喂！\n"
"你已经结束了吗？") //Gold
},
.battledBit = {1 << 8, 1 << 9},
.streakAppearances = {21, 42, 21, 1},
@ -212,12 +212,12 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.objEventGfx = OBJ_EVENT_GFX_LUCY,
.isFemale = TRUE,
.lostTexts = {
COMPOUND_STRING("Urk…"), //Silver
COMPOUND_STRING("Darn!") //Gold
COMPOUND_STRING("呃……"), //Silver
COMPOUND_STRING("可恶！") //Gold
},
.wonTexts = {
COMPOUND_STRING("Humph…"), //Silver
COMPOUND_STRING("Hah!") //Gold
COMPOUND_STRING("哼……"), //Silver
COMPOUND_STRING("哈！") //Gold
},
.battledBit = {1 << 10, 1 << 11},
.streakAppearances = {28, 140, 56, 1},
@ -229,19 +229,19 @@ const struct FrontierBrain gFrontierBrainInfo[NUM_FRONTIER_FACILITIES] =
.isFemale = FALSE,
.lostTexts = {
COMPOUND_STRING(
"That's it! You've done great!\n"
"You've worked hard for this!"), //Silver
"就是这样！做得很棒！\n"
"你有为此好好努力！"), //Silver
COMPOUND_STRING(
"That's it! You've done it!\n"
"You kept working for this!") //Gold
"就是这样！你做到了！\n"
"你有一直不懈地努力！") //Gold
},
.wonTexts = {
COMPOUND_STRING(
"Hey! What's wrong with you!\n"
"Let's see some effort! Get up!"), //Silver
"嘿！你怎么了！\n"
"让我看看你的毅力！站起来！"), //Silver
COMPOUND_STRING(
"Hey! Don't you give up now!\n"
"Get up! Don't lose faith in yourself!") //Gold
"嘿！不要放弃！\n"
"站起来！别对自己丧失信心！") //Gold
},
.battledBit = {1 << 12, 1 << 13},
.streakAppearances = {21, 70, 35, 0},
@ -1012,25 +1012,25 @@ static void TowerPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x
{
default:
case FRONTIER_MODE_SINGLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_TOWER_SINGLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_TOWER_SINGLES_50);
break;
case FRONTIER_MODE_DOUBLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_TOWER_DOUBLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_TOWER_DOUBLES_50);
break;
case FRONTIER_MODE_MULTIS:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_TOWER_MULTIS_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_TOWER_MULTIS_50);
break;
case FRONTIER_MODE_LINK_MULTIS:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_TOWER_LINK_MULTIS_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_TOWER_LINK_MULTIS_50);
@ -1095,13 +1095,13 @@ static void DomePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2
{
default:
case FRONTIER_MODE_SINGLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_DOME_SINGLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_DOME_SINGLES_50);
break;
case FRONTIER_MODE_DOUBLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_DOME_DOUBLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_DOME_DOUBLES_50);
@ -1172,13 +1172,13 @@ static void PalacePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8
{
default:
case FRONTIER_MODE_SINGLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_PALACE_SINGLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_PALACE_SINGLES_50);
break;
case FRONTIER_MODE_DOUBLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_PALACE_DOUBLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_PALACE_DOUBLES_50);
@ -1235,7 +1235,7 @@ static void PikePrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y)
bool8 isCurrent;
u16 winStreak = PikeGetWinStreak(lvlMode);
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_PIKE_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_PIKE_50);
@ -1297,7 +1297,7 @@ static void ArenaPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y)
bool8 isCurrent;
u16 winStreak = ArenaGetWinStreak(lvlMode);
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_ARENA_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_ARENA_50);
@ -1375,13 +1375,13 @@ static void FactoryPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8
{
default:
case FRONTIER_MODE_SINGLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_FACTORY_SINGLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_FACTORY_SINGLES_50);
break;
case FRONTIER_MODE_DOUBLES:
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_FACTORY_DOUBLES_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_FACTORY_DOUBLES_50);
@ -1448,7 +1448,7 @@ static void PyramidPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y)
bool8 isCurrent;
u16 winStreak = PyramidGetWinStreak(lvlMode);
if (lvlMode != FRONTIER_LVL_50)
if (lvlMode ！= FRONTIER_LVL_50)
isCurrent = IsWinStreakActive(STREAK_PYRAMID_OPEN);
else
isCurrent = IsWinStreakActive(STREAK_PYRAMID_50);
@ -1477,7 +1477,7 @@ static void ShowPyramidResultsWindow(void)
CopyWindowToVram(gRecordsWindowId, COPYWIN_FULL);
}
// Link contest records. Why is it in this file?
// Link contest records. Why is it in this file？
static void ShowLinkContestResultsWindow(void)
{
const u8 *str;
@ -1663,7 +1663,7 @@ u8 GetFrontierBrainStatus(void)
s32 winStreak = winStreakNoModifier + gFrontierBrainInfo[facility].streakAppearances[3];
s32 symbolsCount;
if (battleMode != FRONTIER_MODE_SINGLES)
if (battleMode ！= FRONTIER_MODE_SINGLES)
return FRONTIER_BRAIN_NOT_READY;
symbolsCount = GetPlayerSymbolCountForFacility(facility);
@ -1808,7 +1808,7 @@ void ResetWinStreaks(void)
}
}
}
if (gSaveBlock2Ptr->frontier.challengeStatus != 0)
if (gSaveBlock2Ptr->frontier.challengeStatus ！= 0)
gSaveBlock2Ptr->frontier.challengeStatus = CHALLENGE_STATUS_SAVING;
}
@ -1894,7 +1894,7 @@ static void GiveBattlePoints(void)
break;
}
if (challengeNum != 0)
if (challengeNum ！= 0)
challengeNum--;
if (challengeNum >= ARRAY_COUNT(sBattlePointAwards[0][0]))
challengeNum = ARRAY_COUNT(sBattlePointAwards[0][0]) - 1;
@ -1972,16 +1972,16 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL
if (lvlMode == FRONTIER_LVL_50 && monLevel > FRONTIER_MAX_LEVEL_50)
return;
for (i = 0; i < *count && speciesArray[i] != species; i++)
for (i = 0; i < *count && speciesArray[i] ！= species; i++)
;
if (i != *count)
if (i ！= *count)
return;
if (heldItem != 0)
if (heldItem ！= 0)
{
for (i = 0; i < *count && itemsArray[i] != heldItem; i++)
for (i = 0; i < *count && itemsArray[i] ！= heldItem; i++)
;
if (i != *count)
if (i ！= *count)
return;
}
@ -2046,7 +2046,7 @@ static void CheckPartyIneligibility(void)
monId++;
if (monId >= PARTY_SIZE)
monId = 0;
} while (monId != monIdLooper);
} while (monId ！= monIdLooper);
monIdLooper++;
} while (monIdLooper < PARTY_SIZE && numEligibleMons < toChoose);
@ -2163,7 +2163,7 @@ static void RestoreHeldItems(void)
for (i = 0; i < MAX_FRONTIER_PARTY_SIZE; i++)
{
if (gSaveBlock2Ptr->frontier.selectedPartyMons[i] != 0)
if (gSaveBlock2Ptr->frontier.selectedPartyMons[i] ！= 0)
{
u16 item = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_HELD_ITEM, NULL);
SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &item);
@ -2523,13 +2523,13 @@ void CreateFrontierBrainPokemon(void)
monLevel = SetFacilityPtrsGetLevel();
for (i = 0; i < FRONTIER_PARTY_SIZE; selectedMonBits >>= 1, i++)
{
if (!(selectedMonBits & 1))
if (！(selectedMonBits & 1))
continue;
do
{
j = Random32(); //should just be one while loop, but that doesn't match
} while (sFrontierBrainsMons[facility][symbol][i].nature != GetNatureFromPersonality(j));
} while (sFrontierBrainsMons[facility][symbol][i].nature ！= GetNatureFromPersonality(j));
CreateMon(&gEnemyParty[monPartyId],
sFrontierBrainsMons[facility][symbol][i].species,
monLevel,

11
src/save_failed_screen.c
View File

@ -449,14 +449,13 @@ void CB2_FlashNotDetectedScreen(void)
InitWindows(textWin);
DrawStdFrameWithCustomTileAndPalette(0, TRUE, 0x214, 0xE);
static const u8 saveFailedMessage[] =_(
"{COLOR RED}ERROR! {COLOR DARK_GRAY}Flash memory not detected!\n"
"{COLOR RED}发生错误! {COLOR DARK_GRAY}未检测到闪存!\n"
"\n"
"If playing on an emulator, set your\n"
"save type setting to\n"
"Flash 1Mb/128K and reload the ROM.\n"
"如果在模拟器上运行，请将存档类型设置为\n"
"1Mb/128K，然后重新加载ROM文件。\n"
"\n"
"If playing on hardware, your cart\n"
"does not have a working flash chip.");
"如果在硬件上运行, 那么您的卡带\n"
"没有可用的闪存芯片！");
SaveFailedScreenTextPrint(saveFailedMessage, 1, 0);
TransferPlttBuffer();
*(u16*)PLTT = RGB(17, 18, 31);