Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 00:32:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename strbufIndex -> templateArg

Browse Source
This commit is contained in:
RavePossum 2024-07-22 14:10:24 -04:00
parent 60fb66921c
commit c506ce69c6
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
asm/macros/scrcmd.inc
View File

@ -1120,36 +1120,36 @@
.short 204
.endm
.macro BufferPlayerName strbufIndex
.macro BufferPlayerName templateArg
.short 205
.byte \strbufIndex
.byte \templateArg
.endm
.macro BufferRivalName strbufIndex
.macro BufferRivalName templateArg
.short 206
.byte \strbufIndex
.byte \templateArg
.endm
.macro BufferCounterpartName strbufIndex
.macro BufferCounterpartName templateArg
.short 207
.byte \strbufIndex
.byte \templateArg
.endm
.macro BufferPartyMonSpecies strbufIndex, partySlot
.macro BufferPartyMonSpecies templateArg, partySlot
.short 208
.byte \strbufIndex
.byte \templateArg
.short \partySlot
.endm
.macro BufferItemName strbufIndex, item
.macro BufferItemName templateArg, item
.short 209
.byte \strbufIndex
.byte \templateArg
.short \item
.endm
.macro BufferPocketName strbufIndex, pocket
.macro BufferPocketName templateArg, pocket
.short 210
.byte \strbufIndex
.byte \templateArg
.short \pocket
.endm
@ -1165,21 +1165,21 @@
.short \arg1
.endm
.macro BufferNumber strbufIndex, number
.macro BufferNumber templateArg, number
.short 213
.byte \strbufIndex
.byte \templateArg
.short \number
.endm
.macro BufferPartyMonNickname strbufIndex, partySlot
.macro BufferPartyMonNickname templateArg, partySlot
.short 214
.byte \strbufIndex
.byte \templateArg
.short \partySlot
.endm
.macro BufferPoketchAppName strbufIndex, appID
.macro BufferPoketchAppName templateArg, appID
.short 215
.byte \strbufIndex
.byte \templateArg
.short \appID
.endm

36
src/unk_020474B8.c
View File

@ -48,9 +48,9 @@ BOOL ScrCmd_BufferPlayerName(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
StringTemplate_SetPlayerName(*strTemplate, strbufIndex, SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)));
StringTemplate_SetPlayerName(*strTemplate, templateArg, SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)));
return FALSE;
}
@ -58,9 +58,9 @@ BOOL ScrCmd_BufferRivalName(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
StringTemplate_SetRivalName(*strTemplate, strbufIndex, fieldSystem->saveData);
StringTemplate_SetRivalName(*strTemplate, templateArg, fieldSystem->saveData);
return FALSE;
}
@ -68,9 +68,9 @@ BOOL ScrCmd_BufferCounterpartName(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
StringTemplate_SetCounterpartName(*strTemplate, strbufIndex, fieldSystem->saveData);
StringTemplate_SetCounterpartName(*strTemplate, templateArg, fieldSystem->saveData);
return FALSE;
}
@ -78,11 +78,11 @@ BOOL ScrCmd_BufferPartyMonSpecies(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
u16 partySlot = ScriptContext_GetVar(ctx);
Pokemon *mon = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), partySlot);
StringTemplate_SetSpeciesName(*strTemplate, strbufIndex, (BoxPokemon *)mon);
StringTemplate_SetSpeciesName(*strTemplate, templateArg, (BoxPokemon *)mon);
return FALSE;
}
@ -101,10 +101,10 @@ BOOL ScrCmd_BufferItemName(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
u16 item = ScriptContext_GetVar(ctx);
StringTemplate_SetItemName(*strTemplate, strbufIndex, item);
StringTemplate_SetItemName(*strTemplate, templateArg, item);
return FALSE;
}
@ -112,10 +112,10 @@ BOOL ScrCmd_BufferPocketName(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
u16 pocket = ScriptContext_GetVar(ctx);
StringTemplate_SetBagPocketName(*strTemplate, strbufIndex, pocket);
StringTemplate_SetBagPocketName(*strTemplate, templateArg, pocket);
return FALSE;
}
@ -148,10 +148,10 @@ BOOL ScrCmd_BufferNumber(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
u16 number = ScriptContext_GetVar(ctx);
StringTemplate_SetNumber(*strTemplate, strbufIndex, number, sub_0205DFC4(number), PADDING_MODE_SPACES, CHARSET_MODE_EN);
StringTemplate_SetNumber(*strTemplate, templateArg, number, sub_0205DFC4(number), PADDING_MODE_SPACES, CHARSET_MODE_EN);
return FALSE;
}
@ -193,11 +193,11 @@ BOOL ScrCmd_BufferPartyMonNickname(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
u16 partySlot = ScriptContext_GetVar(ctx);
Pokemon *mon = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), partySlot);
StringTemplate_SetNickname(*strTemplate, strbufIndex, (BoxPokemon *)mon);
StringTemplate_SetNickname(*strTemplate, templateArg, (BoxPokemon *)mon);
return FALSE;
}
@ -224,10 +224,10 @@ BOOL ScrCmd_BufferPoketchAppName(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 strbufIndex = ScriptContext_ReadByte(ctx);
u8 templateArg = ScriptContext_ReadByte(ctx);
u16 appID = ScriptContext_GetVar(ctx);
StringTemplate_SetPoketchAppName(*strTemplate, strbufIndex, appID);
StringTemplate_SetPoketchAppName(*strTemplate, templateArg, appID);
return FALSE;
}