Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-12 19:56:00 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up var pointer retrieval in scrcmds

Browse Source
This commit is contained in:
Gudf
2026-07-31 19:08:10 +02:00
parent 4a2cac362f
commit b977cc2bf5
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/scrcmd.c
View File

@@ -3251,7 +3251,7 @@ static BOOL ScrCmd_1D7(ScriptContext *ctx)
static BOOL ScrCmd_CheckCanCookPoffin(ScriptContext *ctx)
{
u16 *destVar = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx));
u16 *destVar = ScriptContext_GetVarPointer(ctx);
if (!Bag_HasItemsInPocket(SaveData_GetBag(ctx->fieldSystem->saveData), POCKET_BERRIES)) {
*destVar = 1;
@@ -3384,9 +3384,7 @@ static BOOL ScrCmd_TryStartGTSApp(ScriptContext *ctx)
static BOOL ScrCmd_0B3(ScriptContext *ctx)
{
u16 v0 = ScriptContext_ReadHalfWord(ctx);
sub_0207DDE0(ctx->task, FieldSystem_GetVarPointer(ctx->fieldSystem, v0));
sub_0207DDE0(ctx->task, ScriptContext_GetVarPointer(ctx));
return TRUE;
}
@@ -5517,9 +5515,7 @@ static BOOL ScrCmd_GetDayOfWeek(ScriptContext *ctx)
static BOOL ScrCmd_OpenBattleRegulationMenu(ScriptContext *ctx)
{
u16 destVar = ScriptContext_ReadHalfWord(ctx);
OpenBattleRegulationMenu(ctx->task, FieldSystem_GetVarPointer(ctx->fieldSystem, destVar));
OpenBattleRegulationMenu(ctx->task, ScriptContext_GetVarPointer(ctx));
return TRUE;
}
@@ -5878,7 +5874,7 @@ static BOOL ScrCmd_FlickerObject(ScriptContext *ctx)
static BOOL ScrCmd_CheckHasAllLegendaryTitansInParty(ScriptContext *ctx)
{
u16 *destVar = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx));
u16 *destVar = ScriptContext_GetVarPointer(ctx);
*destVar = HasAllLegendaryTitansInParty(ctx->fieldSystem->saveData);
return FALSE;
@@ -6871,8 +6867,7 @@ static BOOL ScrCmd_2F6(ScriptContext *ctx)
static BOOL ScrCmd_2F7(ScriptContext *ctx)
{
u16 v0 = ScriptContext_ReadHalfWord(ctx);
u16 *v1 = FieldSystem_GetVarPointer(ctx->fieldSystem, v0);
u16 *v1 = ScriptContext_GetVarPointer(ctx);
if (WiFiList_HasValidLogin(ctx->fieldSystem->saveData)) {
sub_0205749C(ctx->task, *v1);