Skip to content

Commit

Permalink
SCRIPTENV_MSGFMT to SCRIPT_ENV_MESSAGE_FORMAT
Browse files Browse the repository at this point in the history
  • Loading branch information
@red031000
red031000 committed May 16, 2023
1 parent 615228b commit 3e1a667
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 76 deletions.
2 changes: 1 addition & 1 deletion include/script.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ typedef enum ScriptEnvField {
SCRIPTENV_SCRIPT_CONTEXT_0,
SCRIPTENV_SCRIPT_CONTEXT_1,
SCRIPTENV_SCRIPT_CONTEXT_2,
SCRIPTENV_MSGFMT = 16,
SCRIPTENV_MESSAGE_FORMAT,
SCRIPTENV_STRBUF1 = 17,
SCRIPTENV_STRBUF2 = 18,
SCRIPTENV_WAITING_ICON = 19,
Expand Down
2 changes: 1 addition & 1 deletion src/fieldmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv
case SCRIPTENV_SCRIPT_CONTEXT_1:
case SCRIPTENV_SCRIPT_CONTEXT_2:
return &environment->scriptContexts[field - SCRIPTENV_SCRIPT_CONTEXT_0];
case SCRIPTENV_MSGFMT:
case SCRIPTENV_MESSAGE_FORMAT:
return &environment->msgfmt;
case SCRIPTENV_STRBUF1:
return &environment->strbuf1;
Expand Down
2 changes: 1 addition & 1 deletion src/scrcmd_8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BOOL ScrCmd_GetStaticEncounterOutcomeFlag(SCRIPTCONTEXT *ctx) {
}

BOOL ScrCmd_465(SCRIPTCONTEXT *ctx) {
MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
SAV_FRIEND_GRP *group = Save_FriendGroup_get(ctx->fsys->savedata);
SAVEDATA *save = ctx->fsys->savedata;

Expand Down
34 changes: 17 additions & 17 deletions src/scrcmd_c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ BOOL ScrCmd_DirectionSignpost(SCRIPTCONTEXT* ctx) {
FieldSystem* fsys = ctx->fsys;
STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2);
STRING** unk1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 msg_no = ScriptReadByte(ctx);
unk2 = ScriptReadByte(ctx);
u16 arrow = ScriptReadHalfword(ctx);
Expand Down Expand Up @@ -829,7 +829,7 @@ BOOL ScrCmd_TrainerTips(SCRIPTCONTEXT* ctx) {
u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER);
STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2);
STRING** unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 msg_no = ScriptReadByte(ctx);
u16 result_var_id = ScriptReadHalfword(ctx);

Expand Down Expand Up @@ -972,7 +972,7 @@ BOOL ScrCmd_RemoveWaitingIcon(SCRIPTCONTEXT *ctx) {

void sub_02041770(SCRIPTCONTEXT *ctx, struct UnkStruct_ov01_021EDC28 **a1, MSGDATA *msgData) {
FieldSystem *fsys = ctx->fsys;
MessageFormat **msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat **msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 x = ScriptReadByte(ctx);
u8 y = ScriptReadByte(ctx);
u8 initCursorPos = ScriptReadByte(ctx);
Expand Down Expand Up @@ -2159,7 +2159,7 @@ BOOL ScrCmd_PromptEasyChat(SCRIPTCONTEXT *ctx) {
}

BOOL ScrCmd_494(SCRIPTCONTEXT *ctx) {
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u16 idx = ScriptGetVar(ctx);
u16 word = ScriptGetVar(ctx);
BufferECWord(*p_msgFmt, idx, word);
Expand Down Expand Up @@ -2499,7 +2499,7 @@ BOOL ScrCmd_GetDynamicWarpFloorNo(SCRIPTCONTEXT *ctx) {

BOOL ScrCmd_ElevatorCurFloorBox(SCRIPTCONTEXT *ctx) {
FieldSystem *fsys = ctx->fsys;
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 x = ScriptReadByte(ctx);
u8 y = ScriptReadByte(ctx);
u16 *p_ret = ScriptGetVarPointer(ctx);
Expand Down Expand Up @@ -2658,7 +2658,7 @@ BOOL ScrCmd_258(SCRIPTCONTEXT *ctx) {
}

BOOL ScrCmd_259(SCRIPTCONTEXT *ctx) {
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u16 *p_ret = ScriptGetVarPointer(ctx);

*p_ret = sub_0205A6AC(*p_msgFmt);
Expand All @@ -2667,7 +2667,7 @@ BOOL ScrCmd_259(SCRIPTCONTEXT *ctx) {

BOOL ScrCmd_260(SCRIPTCONTEXT *ctx) {
u16 *p_ret = ScriptGetVarPointer(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);

*p_ret = sub_0205A9A0(ctx->fsys->unk80, *p_msgFmt);
return FALSE;
Expand All @@ -2688,7 +2688,7 @@ BOOL ScrCmd_261(SCRIPTCONTEXT *ctx) {

BOOL ScrCmd_264(SCRIPTCONTEXT *ctx) {
LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u16 r4 = ScriptReadHalfword(ctx);
PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(ctx->fsys));
SAVE_EASY_CHAT_T *easyChat = SaveData_EasyChat_get(FieldSys_GetSaveDataPtr(ctx->fsys));
Expand Down Expand Up @@ -2725,7 +2725,7 @@ BOOL ScrCmd_267(SCRIPTCONTEXT *ctx) {
LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED);
u16 sp0 = ScriptReadHalfword(ctx);
u16 *p_ret = ScriptGetVarPointer(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
*p_ret = sub_0205A750(ctx->fsys->unk80, MapObject_GetID(*p_lastInteracted), sp0, *p_msgFmt);
return FALSE;
}
Expand Down Expand Up @@ -2856,7 +2856,7 @@ BOOL ScrCmd_286(SCRIPTCONTEXT *ctx) {

BOOL ScrCmd_287(SCRIPTCONTEXT *ctx) {
PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(ctx->fsys));
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
sub_0205B3DC(
PlayerProfile_GetTrainerID(profile),
PlayerProfile_GetTrainerGender(profile),
Expand Down Expand Up @@ -3840,7 +3840,7 @@ BOOL ScrCmd_530(SCRIPTCONTEXT *ctx) {
}

BOOL ScrCmd_BufferBackgroundName(SCRIPTCONTEXT *ctx) {
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 bufferId = ScriptReadByte(ctx);
u16 backgroundId = ScriptGetVar(ctx);
BufferContestBackgroundName(*p_msgFmt, bufferId, backgroundId);
Expand Down Expand Up @@ -3868,7 +3868,7 @@ BOOL ScrCmd_537(SCRIPTCONTEXT *ctx) {
BOOL ScrCmd_538(SCRIPTCONTEXT *ctx) {
u16 *p_ret = ScriptGetVarPointer(ctx);
u16 wordIdx = ScriptGetVar(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
int trendy = SaveEasyChat_RandomTrendySayingSet(SaveData_EasyChat_get(ctx->fsys->savedata));
if (trendy == 32) {
*p_ret = 0xFFFF;
Expand Down Expand Up @@ -4066,7 +4066,7 @@ BOOL ScrCmd_573(SCRIPTCONTEXT *ctx) {
BOOL ScrCmd_576(SCRIPTCONTEXT *ctx) {
FieldSystem *fsys = ctx->fsys;
u16 *p_ret = ScriptGetVarPointer(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
*p_ret = sub_0205A6AC(*p_msgFmt);
return FALSE;
}
Expand Down Expand Up @@ -5283,14 +5283,14 @@ BOOL ScrCmd_CheckBankBalance(SCRIPTCONTEXT *ctx) {

BOOL ScrCmd_BufferRulesetName(SCRIPTCONTEXT *ctx) {
u16 ruleset = ScriptReadHalfword(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
ov03_022566D0(ctx->fsys, *p_msgFmt, ruleset);
return FALSE;
}

BOOL ScrCmd_799(SCRIPTCONTEXT *ctx) {
u16 *p_var = ScriptGetVarPointer(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
ov03_022566D0(ctx->fsys, *p_msgFmt, *p_var);
return FALSE;
}
Expand All @@ -5317,7 +5317,7 @@ BOOL ScrCmd_802(SCRIPTCONTEXT *ctx) {
BOOL ScrCmd_803(SCRIPTCONTEXT *ctx) {
u16 *r4 = ScriptGetVarPointer(ctx);
u16 *r6 = ScriptGetVarPointer(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
*r6 = ov03_02256A2C(ctx->fsys, *p_msgFmt, *r4);
return FALSE;
}
Expand Down Expand Up @@ -5374,7 +5374,7 @@ BOOL ScrCmd_822(SCRIPTCONTEXT *ctx) {

BOOL ScrCmd_823(SCRIPTCONTEXT *ctx) {
u16 *p_var = ScriptGetVarPointer(ctx);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
PLAYERPROFILE *profile = PlayerProfile_new(4);
SafariZone_GetLinkLeaderToProfile(Save_SafariZone_get(ctx->fsys->savedata), profile);
BufferPlayersName(*p_msgFmt, *p_var, profile);
Expand Down
12 changes: 6 additions & 6 deletions src/scrcmd_daycare.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static LocalMapObject* CreateDayCareMonSpriteInternal(MapObjectMan* object_man,

BOOL ScrCmd_BufferDayCareMonNicks(SCRIPTCONTEXT* ctx) {
SAVEDATA* savedata = ctx->fsys->savedata;
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
DAYCARE* daycare = Sav2_DayCare_get(savedata);

Sav2_DayCare_BufferStoredMonNicks(daycare, *msg_fmt);
Expand Down Expand Up @@ -54,7 +54,7 @@ BOOL ScrCmd_GiveDayCareEgg(SCRIPTCONTEXT* ctx) {

BOOL ScrCmd_RetrieveDayCareMon(SCRIPTCONTEXT* ctx) {
FieldSystem* fsys = ctx->fsys;
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
SAVEDATA* savedata = fsys->savedata;
u16* ret_ptr = ScriptGetVarPointer(ctx);
u16 daycare_mon_idx = ScriptGetVar(ctx);
Expand All @@ -68,7 +68,7 @@ BOOL ScrCmd_RetrieveDayCareMon(SCRIPTCONTEXT* ctx) {

BOOL ScrCmd_BufferDayCareWithdrawCost(SCRIPTCONTEXT* ctx) {
FieldSystem* fsys = ctx->fsys;
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
SAVEDATA* savedata = fsys->savedata;
u16* ret_ptr = ScriptGetVarPointer(ctx);
u16 daycare_mon_idx = ScriptGetVar(ctx);
Expand All @@ -81,7 +81,7 @@ BOOL ScrCmd_BufferDayCareWithdrawCost(SCRIPTCONTEXT* ctx) {

BOOL ScrCmd_BufferDayCareMonGrowth(SCRIPTCONTEXT* ctx) {
SAVEDATA* savedata = ctx->fsys->savedata;
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u16* ret_ptr = ScriptGetVarPointer(ctx);
u16 daycare_mon_idx = ScriptGetVar(ctx);
DAYCARE* daycare = SavArray_get(savedata, SAVE_DAYCARE);
Expand All @@ -93,7 +93,7 @@ BOOL ScrCmd_BufferDayCareMonGrowth(SCRIPTCONTEXT* ctx) {

BOOL ScrCmd_GetTailDayCareMonSpeciesAndNick(SCRIPTCONTEXT* ctx) {
FieldSystem* fsys = ctx->fsys;
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u16* ret_ptr = ScriptGetVarPointer(ctx);
DAYCARE* daycare = Sav2_DayCare_get(fsys->savedata);

Expand All @@ -116,7 +116,7 @@ BOOL ScrCmd_PutMonInDayCare(SCRIPTCONTEXT* ctx) {

BOOL ScrCmd_BufferDayCareMonStats(SCRIPTCONTEXT* ctx) {
SAVEDATA* savedata = ctx->fsys->savedata;
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u16 nickname_idx = ScriptGetVar(ctx);
u16 level_idx = ScriptGetVar(ctx);
u16 gender_idx = ScriptGetVar(ctx);
Expand Down
2 changes: 1 addition & 1 deletion src/scrcmd_lottery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
u8 LotoId_CountDigitsMatched(u16 lotoId, u16 otid);

BOOL ScrCmd_BufferDeptStoreFloorNo(SCRIPTCONTEXT *ctx) {
MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 fieldno = ScriptReadByte(ctx);
u8 floor = ScriptReadByte(ctx);
BufferDeptStoreFloorNo(*msg, fieldno, floor);
Expand Down
12 changes: 6 additions & 6 deletions src/scrcmd_pokemon_misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ BOOL ScrCmd_648(SCRIPTCONTEXT *ctx) {
MSGDATA *msgdata;
FieldSystem *fsys = ctx->fsys;

msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
u32 unkA = VarGet(ctx->fsys, ScriptReadHalfword(ctx));
u32 fileIndex = VarGet(ctx->fsys, ScriptReadHalfword(ctx));
u16 unkC = ScriptReadHalfword(ctx);
Expand Down Expand Up @@ -874,7 +874,7 @@ BOOL ScrCmd_741(SCRIPTCONTEXT *ctx) {
STRING *str;

apricornBox = Save_ApricornBox_get(ctx->fsys->savedata);
msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
unkVar = VarGet(ctx->fsys, ScriptReadHalfword(ctx));
unkPtrA = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx));
price = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx));
Expand Down Expand Up @@ -1198,7 +1198,7 @@ BOOL ScrCmd_CasinoGame(SCRIPTCONTEXT *ctx) {
BOOL ScrCmd_BufferPokeathlonCourseName(SCRIPTCONTEXT *ctx) {
u8 fieldNo = *(ctx->script_ptr++);
u32 courseId = VarGet(ctx->fsys, ScriptReadHalfword(ctx));
BufferPokeathlonCourseName(*(MessageFormat**)FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT), fieldNo, (u8) courseId);
BufferPokeathlonCourseName(*(MessageFormat**)FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT), fieldNo, (u8) courseId);
return FALSE;
}

Expand Down Expand Up @@ -1442,7 +1442,7 @@ BOOL ScrCmd_BufferBugContestWinner(SCRIPTCONTEXT *ctx) {
MessageFormat **msgfmt;
BUGCONTEST *bugContest;

msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
bugContest = FieldSys_BugContest_get(ctx->fsys);

BugContest_BufferContestWinnerNames(bugContest, ctx->msgdata, *msgfmt, *ctx->script_ptr++);
Expand Down Expand Up @@ -1480,7 +1480,7 @@ BOOL ScrCmd_BufferBugContestMonNick(SCRIPTCONTEXT *ctx) {
BUGCONTEST *bugContest;
u32 script_index;

msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);
bugContest = FieldSys_BugContest_get(ctx->fsys);

script_index = *(ctx->script_ptr++);
Expand All @@ -1496,7 +1496,7 @@ BOOL ScrCmd_BugContestGetTimeLeft(SCRIPTCONTEXT *ctx) {
u32 script_index;
u32 timeLeft;

msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT);
msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT);

script_index = *(ctx->script_ptr++);
timeLeft = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/scrcmd_size_record.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static void FormatSizeRecord(FieldSystem *fsys, u8 idx0, u8 idx1, u16 species, u
u32 score;
u32 r4;

msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT);
msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
score = GetMonSize(species, rand);
r4 = LengthConvertToImperial(score);
BufferIntegerAsString(*msgFmt, idx0, r4 / 10, 3, STRCONVMODE_LEFT_ALIGN, TRUE);
Expand Down
Loading

0 comments on commit 3e1a667

Please sign in to comment.