dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync/document battle_message.c

Browse Source
This commit is contained in:
GriffinR
2022-08-12 13:08:40 -04:00
parent a530bb3a74
commit a064849864
33 changed files with 776 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_link_opponent.c
+1 -1
View File
@@ -1134,7 +1134,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
else
{
xPos = 176;
if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00)
if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM)
{
trainerPicId = GetUnionRoomTrainerPic();
}
src/battle_controller_player.c
+2 -2
View File
@@ -1369,7 +1369,7 @@ static void MoveSelectionDisplayMoveNames(void)
for (i = 0; i < MAX_MON_MOVES; ++i)
{
MoveSelectionDestroyCursorAt(i);
StringCopy(gDisplayedStringBattle, gUnknown_83FE770);
StringCopy(gDisplayedStringBattle, gText_MoveInterfaceDynamicColors);
StringAppend(gDisplayedStringBattle, gMoveNames[moveInfo->moves[i]]);
BattlePutTextOnWindow(gDisplayedStringBattle, i + 3);
if (moveInfo->moves[i] != MOVE_NONE)
@@ -1407,7 +1407,7 @@ static void MoveSelectionDisplayMoveType(void)
*txtPtr++ = EXT_CTRL_CODE_BEGIN;
*txtPtr++ = 6;
*txtPtr++ = 1;
txtPtr = StringCopy(txtPtr, gUnknown_83FE770);
txtPtr = StringCopy(txtPtr, gText_MoveInterfaceDynamicColors);
StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_TYPE);
}
src/battle_controller_safari.c
+1 -1
View File
@@ -439,7 +439,7 @@ static void SafariHandleChooseAction(void)
gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG);
BattlePutTextOnWindow(gUnknown_83FE747, B_WIN_ACTION_MENU);
BattlePutTextOnWindow(gText_SafariZoneMenu, B_WIN_ACTION_MENU);
for (i = 0; i < 4; ++i)
ActionSelectionDestroyCursorAt(i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
src/battle_interface.c
+1 -1
View File
@@ -1466,7 +1466,7 @@ void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
ptr = StringCopy(gDisplayedStringBattle, gUnknown_8260556);
GetMonData(mon, MON_DATA_NICKNAME, nickname);
StringGetEnd10(nickname);
StringGet_Nickname(nickname);
ptr = StringCopy(ptr, nickname);
*ptr++ = EXT_CTRL_CODE_BEGIN;
*ptr++ = EXT_CTRL_CODE_COLOR;
src/battle_message.c
+686 -349
View File
File diff suppressed because it is too large Load Diff
src/battle_script_commands.c
+1 -1
View File
@@ -6125,7 +6125,7 @@ static void Cmd_various(void)
gHitMarker &= ~HITMARKER_PLAYER_FAINTED;
}
break;
case VARIOUS_CASE_8:
case VARIOUS_GET_BATTLERS_FOR_RECALL:
i = 0; // redundant
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
gActiveBattler = 1;
src/battle_tower.c
+8 -8
View File
@@ -717,21 +717,21 @@ static u8 AppendBattleTowerBannedSpeciesName(u16 species, u8 count)
if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
{
if (count == 0)
StringAppend(gStringVar1, gUnknown_83FE859);
StringAppend(gStringVar1, gText_BattleTowerBan_Space);
count++;
StringAppend(gStringVar1, gSpeciesNames[species]);
switch (count)
{
case 2:
StringAppend(gStringVar1, gUnknown_83FE85E);
StringAppend(gStringVar1, gText_BattleTowerBan_Newline2);
break;
case 5:
case 8:
case 11:
StringAppend(gStringVar1, gUnknown_83FE85C);
StringAppend(gStringVar1, gText_BattleTowerBan_Newline1);
break;
default:
StringAppend(gStringVar1, gUnknown_83FE859);
StringAppend(gStringVar1, gText_BattleTowerBan_Space);
break;
}
}
@@ -815,9 +815,9 @@ void CheckPartyBattleTowerBanlist(void)
i = StringLength(gStringVar1);
gStringVar1[i - 1] = EOS;
if (counter < 3)
StringAppend(gStringVar1, gUnknown_83FE860);
StringAppend(gStringVar1, gText_BattleTowerBan_Is1);
else
StringAppend(gStringVar1, gUnknown_83FE864);
StringAppend(gStringVar1, gText_BattleTowerBan_Is2);
}
else
{
@@ -1119,7 +1119,7 @@ static void SetPlayerBattleTowerRecord(void)
playerRecord->trainerClass = trainerClass;
CopyTrainerId(playerRecord->trainerId, gSaveBlock2Ptr->playerTrainerId);
StringCopy7(playerRecord->name, gSaveBlock2Ptr->playerName);
StringCopy_PlayerName(playerRecord->name, gSaveBlock2Ptr->playerName);
playerRecord->winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
@@ -1310,7 +1310,7 @@ static void Debug_FillEReaderTrainerWithPlayerData(void)
}
CopyTrainerId(ereaderTrainer->trainerId, gSaveBlock2Ptr->playerTrainerId);
StringCopy7(ereaderTrainer->name, gSaveBlock2Ptr->playerName);
StringCopy_PlayerName(ereaderTrainer->name, gSaveBlock2Ptr->playerName);
ereaderTrainer->winStreak = 1;
src/field_poison.c
+1 -1
View File
@@ -36,7 +36,7 @@ static void FaintFromFieldPoison(u8 partyIdx)
AdjustFriendship(pokemon, FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE);
SetMonData(pokemon, MON_DATA_STATUS, &status);
GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
StringGetEnd10(gStringVar1);
StringGet_Nickname(gStringVar1);
}
static bool32 MonFaintedFromPoison(u8 partyIdx)
src/field_specials.c
+1 -1
View File
@@ -1663,7 +1663,7 @@ static void ChangePokemonNickname_CB(void)
void BufferMonNickname(void)
{
GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
StringGetEnd10(gStringVar1);
StringGet_Nickname(gStringVar1);
}
void IsMonOTIDNotPlayers(void)
src/graphics.c
+1 -1
View File
@@ -950,7 +950,7 @@ const u32 gBattleAnimSpritePal_Meteor[] = INCBIN_U32("graphics/battle_anims/spri
const u32 gBattleAnimSpriteGfx_FlatRock[] = INCBIN_U32("graphics/battle_anims/sprites/flat_rock.4bpp.lz");
const u32 gBattleAnimSpritePal_FlatRock[] = INCBIN_U32("graphics/battle_anims/sprites/flat_rock.gbapal.lz");
const u16 gUnknown_8D2FBB4[] = INCBIN_U16("graphics/interface/unk_8D2FBB4.gbapal");
const u16 gPPTextPalette[] = INCBIN_U16("graphics/interface/text_pp.gbapal");
#include "data/graphics/pokemon.h"
#include "data/graphics/trainers.h"
src/party_menu.c
+2 -2
View File
@@ -895,7 +895,7 @@ static void DisplayPartyPokemonDataForMultiBattle(u8 slot)
{
menuBox->infoRects->blitFunc(menuBox->windowId, 0, 0, 0, 0, FALSE);
StringCopy(gStringVar1, gMultiPartnerParty[actualSlot].nickname);
StringGetEnd10(gStringVar1);
StringGet_Nickname(gStringVar1);
if (StringLength(gStringVar1) <= 5)
ConvertInternationalString(gStringVar1, 1);
DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, menuBox->infoRects->dimensions);
@@ -1530,7 +1530,7 @@ static s8 GetNewSlotDoubleLayout(s8 slotId, s8 movementDir)
u8 *GetMonNickname(struct Pokemon *mon, u8 *dest)
{
GetMonData(mon, MON_DATA_NICKNAME, dest);
return StringGetEnd10(dest);
return StringGet_Nickname(dest);
}
#define tKeepOpen data[0]
src/pokemon.c
+1 -1
View File
@@ -6082,7 +6082,7 @@ bool8 CheckBattleTypeGhost(struct Pokemon *mon, u8 battlerId)
if (gBattleTypeFlags & BATTLE_TYPE_GHOST && GetBattlerSide(battlerId) != B_SIDE_PLAYER)
{
GetMonData(mon, MON_DATA_NICKNAME, buffer);
StringGetEnd10(buffer);
StringGet_Nickname(buffer);
if (!StringCompare(buffer, gText_Ghost))
return TRUE;
}
src/pokemon_storage_system_5.c
+2 -2
View File
@@ -1026,7 +1026,7 @@ static void SetCursorMonData(void *pokemon, u8 mode)
gPSSData->displayMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG);
GetMonData(mon, MON_DATA_NICKNAME, gPSSData->displayMonName);
StringGetEnd10(gPSSData->displayMonName);
StringGet_Nickname(gPSSData->displayMonName);
gPSSData->displayMonLevel = GetMonData(mon, MON_DATA_LEVEL);
gPSSData->displayMonMarkings = GetMonData(mon, MON_DATA_MARKINGS);
gPSSData->displayMonPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
@@ -1051,7 +1051,7 @@ static void SetCursorMonData(void *pokemon, u8 mode)
GetBoxMonData(boxMon, MON_DATA_NICKNAME, gPSSData->displayMonName);
StringGetEnd10(gPSSData->displayMonName);
StringGet_Nickname(gPSSData->displayMonName);
gPSSData->displayMonLevel = GetLevelFromBoxMonExp(boxMon);
gPSSData->displayMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS);
gPSSData->displayMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY);
src/pokemon_summary_screen.c
+1 -1
View File
@@ -2110,7 +2110,7 @@ static void BufferMonInfo(void)
GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_NICKNAME, tempStr);
StringCopyN_Multibyte(sMonSummaryScreen->summary.nicknameStrBuf, tempStr, POKEMON_NAME_LENGTH);
StringGetEnd10(sMonSummaryScreen->summary.nicknameStrBuf);
StringGet_Nickname(sMonSummaryScreen->summary.nicknameStrBuf);
gender = GetMonGender(&sMonSummaryScreen->currentMon);
dexNum = GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2);
src/quest_log_events.c
+3 -3
View File
@@ -1149,9 +1149,9 @@ static const u16 *BufferQuestLogText_LinkBattledMulti(const u16 *a0)
memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
memset(gStringVar2, EOS, PLAYER_NAME_LENGTH + 1);
memset(gStringVar3, EOS, PLAYER_NAME_LENGTH + 1);
StringCopy7(gStringVar1, (const u8 *)a0 + 5);
StringCopy7(gStringVar2, (const u8 *)a0 + 12);
StringCopy7(gStringVar3, (const u8 *)a0 + 19);
StringCopy_PlayerName(gStringVar1, (const u8 *)a0 + 5);
StringCopy_PlayerName(gStringVar2, (const u8 *)a0 + 12);
StringCopy_PlayerName(gStringVar3, (const u8 *)a0 + 19);
BufferLinkPartnersName(gStringVar1);
BufferLinkPartnersName(gStringVar2);
BufferLinkPartnersName(gStringVar3);
src/scrcmd.c
+1 -1
View File
@@ -1616,7 +1616,7 @@ bool8 ScrCmd_bufferpartymonnick(struct ScriptContext * ctx)
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, sScriptStringVars[stringVarIndex]);
StringGetEnd10(sScriptStringVars[stringVarIndex]);
StringGet_Nickname(sScriptStringVars[stringVarIndex]);
return FALSE;
}
src/string_util.c
+4 -4
View File
@@ -54,10 +54,10 @@ u8 *StringCopy_Nickname(u8 *dest, const u8 *src)
return &dest[i];
}
u8 *StringGetEnd10(u8 *str)
u8 *StringGet_Nickname(u8 *str)
{
u8 i;
u32 limit = 10;
u32 limit = POKEMON_NAME_LENGTH;
for (i = 0; i < limit; i++)
if (str[i] == EOS)
@@ -67,10 +67,10 @@ u8 *StringGetEnd10(u8 *str)
return &str[i];
}
u8 *StringCopy7(u8 *dest, const u8 *src)
u8 *StringCopy_PlayerName(u8 *dest, const u8 *src)
{
s32 i;
s32 limit = 7;
s32 limit = PLAYER_NAME_LENGTH;
for (i = 0; i < limit; i++)
{
src/union_room.c
+1 -1
View File
@@ -645,7 +645,7 @@ static const u8 sUnref_84570D1[] = _("{DYNAMIC 00}·{DYNAMIC 01}");
// These are functions in Emerald but inlined in FireRed
#define IntlConvPartnerUname7(dest, arg1) ({ \
StringCopy7(dest, (arg1).gname_uname.uname); \
StringCopy_PlayerName(dest, (arg1).gname_uname.uname); \
ConvertInternationalString(dest, (arg1).gname_uname.gname.unk_00.language); \
})
src/union_room_battle.c
+1 -1
View File
@@ -58,7 +58,7 @@ static void SetUpPartiesAndStartBattle(void)
}
IncrementGameStat(GAME_STAT_NUM_UNION_ROOM_BATTLES);
CalculatePlayerPartyCount();
gTrainerBattleOpponent_A = TRAINER_OPPONENT_C00;
gTrainerBattleOpponent_A = TRAINER_UNION_ROOM;
SetMainCallback2(CB2_InitBattle);
}