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

训练家之丘人名&PM昵称汉化+修复src\frontier_util.c中文本外叹号全角的错误

Browse Source
This commit is contained in:
RoamerX 2025-04-20 11:30:07 +08:00
parent a8bdd1e303
commit bf30806c70
2 changed files with 264 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

478
src/data/battle_frontier/trainer_hill.h
View File

File diff suppressed because it is too large Load Diff

50
src/frontier_util.c
View File

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