Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update callers of ScriptVar functions to pass NULL for local buffer

Browse Source
This commit is contained in:
Mateon1 2024-09-19 22:39:23 +02:00
parent b6e48bd68b
commit b5bb921ade
No known key found for this signature in database
GPG Key ID: 6A6067123E4CAF6E
14 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/code.c
View File

@ -56,11 +56,11 @@ void ThoroughlyResetScriptVars(void)
puVar1 = &gScriptVarInfo[iVar1];
if (((puVar1->type != 0) && ((puVar1->type != 8)))) {
for (uVar2 = 0; uVar2 < puVar1->arrayLen; uVar2++) {
SetScriptVarArrayValue(0, iVar1, uVar2, puVar1->defaultValue);
SetScriptVarArrayValue(NULL, iVar1, uVar2, puVar1->defaultValue);
}
}
}
ClearScriptVarArray(0,1);
ClearScriptVarArray(NULL,1);
ScenarioCalc(2,0,0);
ScenarioCalc(3,0,0);
ScenarioCalc(4,0,0);
@ -72,37 +72,37 @@ void ThoroughlyResetScriptVars(void)
ScenarioCalc(10,0,0);
ScenarioCalc(0xb,0,0);
ScenarioCalc(0xc,0,0);
SetScriptVarValue(0,0xd,0xa2);
SetScriptVarValue(0,0xe,0);
SetScriptVarValue(0,0xf,0xa2);
SetScriptVarValue(0,0x10,-1);
SetScriptVarValue(0,0x11,0x24);
SetScriptVarValue(0,0x12,-1);
SetScriptVarValue(0,0x13,0);
SetScriptVarValue(0,0x14,-1);
SetScriptVarValue(0,0x16,0);
SetScriptVarValue(0,0x18,0);
SetScriptVarValue(0,0x19,0);
SetScriptVarValue(0,0x1b,-1);
SetScriptVarValue(0,0x1c,0);
SetScriptVarValue(0,0x1d,0);
SetScriptVarValue(0,0x1e,0);
SetScriptVarValue(0,0x1f,0);
ClearScriptVarArray(0,0x24);
SetScriptVarValue(0,0x25,0);
SetScriptVarValue(0,0x26,0);
SetScriptVarValue(0,0x27,0);
SetScriptVarValue(0,0x28,0);
SetScriptVarValue(0,0x29,0);
SetScriptVarValue(0,0x2a,0);
ClearScriptVarArray(0,0x2b);
ClearScriptVarArray(0,0x2c);
ClearScriptVarArray(0,0x2d);
ClearScriptVarArray(0,0x2e);
ClearScriptVarArray(0,0x2f);
ClearScriptVarArray(0,0x30);
ClearScriptVarArray(0,0x31);
ClearScriptVarArray(0,0x41);
SetScriptVarValue(NULL,0xd,0xa2);
SetScriptVarValue(NULL,0xe,0);
SetScriptVarValue(NULL,0xf,0xa2);
SetScriptVarValue(NULL,0x10,-1);
SetScriptVarValue(NULL,0x11,0x24);
SetScriptVarValue(NULL,0x12,-1);
SetScriptVarValue(NULL,0x13,0);
SetScriptVarValue(NULL,0x14,-1);
SetScriptVarValue(NULL,0x16,0);
SetScriptVarValue(NULL,0x18,0);
SetScriptVarValue(NULL,0x19,0);
SetScriptVarValue(NULL,0x1b,-1);
SetScriptVarValue(NULL,0x1c,0);
SetScriptVarValue(NULL,0x1d,0);
SetScriptVarValue(NULL,0x1e,0);
SetScriptVarValue(NULL,0x1f,0);
ClearScriptVarArray(NULL,0x24);
SetScriptVarValue(NULL,0x25,0);
SetScriptVarValue(NULL,0x26,0);
SetScriptVarValue(NULL,0x27,0);
SetScriptVarValue(NULL,0x28,0);
SetScriptVarValue(NULL,0x29,0);
SetScriptVarValue(NULL,0x2a,0);
ClearScriptVarArray(NULL,0x2b);
ClearScriptVarArray(NULL,0x2c);
ClearScriptVarArray(NULL,0x2d);
ClearScriptVarArray(NULL,0x2e);
ClearScriptVarArray(NULL,0x2f);
ClearScriptVarArray(NULL,0x30);
ClearScriptVarArray(NULL,0x31);
ClearScriptVarArray(NULL,0x41);
sub_80972F4();
}

4
src/code_2.c
View File

@ -86,9 +86,9 @@ void GameLoop(void)
ThoroughlyResetScriptVars();
xxx_script_related_8001334(14);
xxx_script_related_8001334(15);
ClearScriptVarArray(0, 57);
ClearScriptVarArray(NULL, 57);
xxx_script_related_8001334(16);
if (GetScriptVarValue(0, 57) == 0)
if (GetScriptVarValue(NULL, 57) == 0)
xxx_script_related_8001334(17);
while (1) {

8
src/code_801B60C.c
View File

@ -160,24 +160,24 @@ static void sub_801B874(void)
if (sUnknown_203B234->unk10.id == ITEM_WEAVILE_FIG) {
sUnknown_203B234->fallbackState = 16;
if (GetScriptVarArrayValue(0, 71, 1)) {
if (GetScriptVarArrayValue(NULL, 71, 1)) {
AddToTeamMoney(1000);
sub_801B748(4);
}
else {
SetScriptVarArrayValue(0, 71, 1, 1);
SetScriptVarArrayValue(NULL, 71, 1, 1);
sub_801B748(3);
}
}
else if (sUnknown_203B234->unk10.id == ITEM_MIME_JR_FIG) {
sUnknown_203B234->fallbackState = 16;
if (GetScriptVarArrayValue(0, 71, 0)) {
if (GetScriptVarArrayValue(NULL, 71, 0)) {
AddToTeamMoney(1000);
sub_801B748(4);
}
else {
SetScriptVarArrayValue(0, 71, 0, 1);
SetScriptVarArrayValue(NULL, 71, 0, 1);
sub_801B748(3);
}
}

28
src/code_80972F4.c
View File

@ -14,9 +14,9 @@ extern void GeneratePelipperJobs(void);
void sub_80972F4(void)
{
ClearScriptVarArray(0, 0x2B);
ClearScriptVarArray(0, 0x2C);
ClearScriptVarArray(0, 0x2D);
ClearScriptVarArray(NULL, 0x2B);
ClearScriptVarArray(NULL, 0x2C);
ClearScriptVarArray(NULL, 0x2D);
}
void nullsub_128(void)
@ -33,7 +33,7 @@ s32 sub_8097318(s16 param_1)
iVar1 = 0;
}
else {
iVar1 = GetScriptVarArrayValue(0,0x2b,param_1_s32);
iVar1 = GetScriptVarArrayValue(NULL,0x2b,param_1_s32);
if (iVar1 != 0) {
iVar1 = 1;
}
@ -52,7 +52,7 @@ void sub_809733C(short param_1,u32 param_2)
if (uVar2 != 0xd) {
uVar2_u16 = uVar2;
if ((((GetScriptVarArrayValue(0,0x2c,uVar2_u16) == 0) && (SetScriptVarArrayValue(0,0x2b,uVar2_u16,param_2_u8), param_2_u8 != '\0')))){
if ((((GetScriptVarArrayValue(NULL,0x2c,uVar2_u16) == 0) && (SetScriptVarArrayValue(NULL,0x2b,uVar2_u16,param_2_u8), param_2_u8 != '\0')))){
switch(uVar2)
{
case 0xE:
@ -73,7 +73,7 @@ bool32 sub_8097384(s16 param_1)
val = FALSE;
else {
// May not need the & 0xFFFF if the 3rd param is s16
val = GetScriptVarArrayValue(0, 44, param_1 & 0xFFFF);
val = GetScriptVarArrayValue(NULL, 44, param_1 & 0xFFFF);
if (val != 0)
val = TRUE;
}
@ -90,12 +90,12 @@ void sub_80973A8(s16 param_1,u32 param_2)
if (param_1_s32 != 0xd) {
if (param_2_u32 != 0) {
sVar1 = sub_80A26B8(param_1);
SetScriptVarArrayValue(0,0x2b,param_1_s32,0);
SetScriptVarArrayValue(NULL,0x2b,param_1_s32,0);
if (sVar1 != -1) {
SetScriptVarValue(0,0x12,sVar1);
SetScriptVarValue(NULL,0x12,sVar1);
}
}
SetScriptVarArrayValue(0,0x2c,param_1_s32,param_2_u32);
SetScriptVarArrayValue(NULL,0x2c,param_1_s32,param_2_u32);
}
}
@ -107,7 +107,7 @@ bool32 RescueScenarioConquered(s16 param_1)
val = FALSE;
else {
// May not need the & 0xFFFF if the 3rd param is s16
val = GetScriptVarArrayValue(0, 45, param_1 & 0xFFFF);
val = GetScriptVarArrayValue(NULL, 45, param_1 & 0xFFFF);
if (val != 0)
val = TRUE;
}
@ -120,7 +120,7 @@ void sub_8097418(s16 index,bool32 param_2)
int index_s32 = index;
bool8 param_2_u8 = param_2;
if (index_s32 != 0xd) {
if ((param_2_u8) && (SetScriptVarArrayValue(0,0x2c,index_s32,0), index_s32 < 0x1f)) {
if ((param_2_u8) && (SetScriptVarArrayValue(NULL,0x2c,index_s32,0), index_s32 < 0x1f)) {
const MissionText *mt = &gStoryMissionText[index_s32];
if (mt->unk4 != 0xFF) {
sub_8097FA8(mt->unk4);
@ -133,7 +133,7 @@ void sub_8097418(s16 index,bool32 param_2)
}
sub_8097FF8();
}
SetScriptVarArrayValue(0,0x2d,index_s32,param_2_u8);
SetScriptVarArrayValue(NULL,0x2d,index_s32,param_2_u8);
}
}
@ -176,8 +176,8 @@ const u8 *GetCurrentMissionText(s16 index)
void sub_80974E8(void)
{
ClearScriptVarArray(0, 0x2E);
ClearScriptVarArray(0, 0x2F);
ClearScriptVarArray(NULL, 0x2E);
ClearScriptVarArray(NULL, 0x2F);
}
void nullsub_208(void)

8
src/code_8097504.c
View File

@ -74,7 +74,7 @@ bool32 IsMazeCompleted(s16 mazeIndex)
{
bool32 mazeCompletion;
mazeCompletion = GetScriptVarArrayValue(0, 0x2e, mazeIndex);
mazeCompletion = GetScriptVarArrayValue(NULL, 0x2e, mazeIndex);
if (mazeCompletion) {
mazeCompletion = TRUE;
}
@ -84,7 +84,7 @@ bool32 IsMazeCompleted(s16 mazeIndex)
void sub_80975A8(s16 param_1,u8 param_2)
{
u16 param_1_u16 = param_1;
SetScriptVarArrayValue(0,0x2e,param_1_u16,param_2);
SetScriptVarArrayValue(NULL,0x2e,param_1_u16,param_2);
}
const u8 *sub_80975C4(s16 index)
@ -118,9 +118,9 @@ bool8 HasCompletedAllMazes(void)
bool8 sub_8097640(void)
{
if(GetScriptVarArrayValue(0, 0x2E, 0x1F) == 0 && HasCompletedAllMazes())
if(GetScriptVarArrayValue(NULL, 0x2E, 0x1F) == 0 && HasCompletedAllMazes())
{
SetScriptVarArrayValue(0, 0x2E, 0x1F, 1);
SetScriptVarArrayValue(NULL, 0x2E, 0x1F, 1);
return TRUE;
}
else

6
src/code_809C5C4.c
View File

@ -272,7 +272,7 @@ void sub_809C770(s16 param_1, s16 param_2)
break;
case 0:
default:
iVar5 = (s16)GetScriptVarValue(0,0x13);
iVar5 = (s16)GetScriptVarValue(NULL,0x13);
break;
}
@ -413,8 +413,8 @@ void sub_809CB74(void) {
void sub_809CB8C(void) {
ClearScriptVarArray(0, 0x3B);
ClearScriptVarArray(0, 0x3D);
ClearScriptVarArray(NULL, 0x3B);
ClearScriptVarArray(NULL, 0x3D);
}
bool8 HasItemInInventory(u8 item)

4
src/code_80A26CC.c
View File

@ -74,7 +74,7 @@ u32 sub_80A25AC(u16 param_1)
return 19;
if (param_1 != 1)
return param_1;
GetScriptVarValue(0, 40);
GetScriptVarValue(NULL, 40);
return 1;
}
@ -460,5 +460,5 @@ const u8 *sub_80A2B18(s16 param_1)
UNUSED static const u8 *sub_80A2B28(u16 r0)
{
return sub_80A2B18(GetScriptVarValue(0, 17));
return sub_80A2B18(GetScriptVarValue(NULL, 17));
}

4
src/credits2.c
View File

@ -14,7 +14,7 @@ bool8 sub_8035678(void)
sCredits2Work = MemoryAlloc(sizeof(Credits2Work), 8);
sCredits2Work->state = 0;
sCredits2Work->unk4 = 0;
ClearScriptVarArray(0, 57);
ClearScriptVarArray(NULL, 57);
return TRUE;
}
@ -62,7 +62,7 @@ u32 sub_80356A0(void)
return 3; // sub_809C478 clears the flash data when this is returned
}
if (GetScriptVarValue(0, 57) != 0) {
if (GetScriptVarValue(NULL, 57) != 0) {
sCredits2Work->state = 3;
return 2;
}

26
src/event_flag.c
View File

@ -131,8 +131,8 @@ void ScriptVarStringPopFirstChar(s16 varId,u32 param_2,s32 maxLen)
void GetScriptVarScenario(s32 param_1,u32 *param_2,u32 *param_3)
{
*param_2 = GetScriptVarArrayValue(0, (s16)param_1, 0);
*param_3 = GetScriptVarArrayValue(0, (s16)param_1, 1);
*param_2 = GetScriptVarArrayValue(NULL, (s16)param_1, 0);
*param_3 = GetScriptVarArrayValue(NULL, (s16)param_1, 1);
}
void ScenarioCalc(s16 param_1,s32 param_2,s32 param_3)
@ -145,10 +145,10 @@ void ScenarioCalc(s16 param_1,s32 param_2,s32 param_3)
GetScriptVarScenario(param_1_s32,&local_18,&local_14);
Log(6,gUnknown_80B72CC,param_1_s32,local_18,local_14,param_2,param_3); // SCENARIO CALC [%3d] %4d %4d -> %4d %4d
if ((param_1_s32 == 3) && ((param_2 != local_18 || (param_3 != local_14)))) {
SetScriptVarValue(0,0x19,0);
SetScriptVarValue(NULL,0x19,0);
}
SetScriptVarArrayValue(0,param_1_s32,0,param_2);
SetScriptVarArrayValue(0,param_1_s32,1,param_3);
SetScriptVarArrayValue(NULL,param_1_s32,0,param_2);
SetScriptVarArrayValue(NULL,param_1_s32,1,param_3);
switch(param_1_s32)
{
@ -186,8 +186,8 @@ bool8 ScriptVarScenarioBefore(s16 param_1,u32 param_2,s32 param_3)
s32 uVar1;
s32 iVar2;
uVar1 = GetScriptVarArrayValue(0,param_1,0);
iVar2 = GetScriptVarArrayValue(0,param_1,1);
uVar1 = GetScriptVarArrayValue(NULL,param_1,0);
iVar2 = GetScriptVarArrayValue(NULL,param_1,1);
if ((uVar1 != 0x3a) &&
(uVar1 < param_2 || (param_3 >= 0 && (uVar1 == param_2) && (iVar2 < param_3)))) {
return TRUE;
@ -202,8 +202,8 @@ bool8 ScriptVarScenarioEqual(s16 param_1,u32 param_2,s32 param_3)
s32 uVar1;
s32 iVar2;
uVar1 = GetScriptVarArrayValue(0, param_1, 0);
iVar2 = GetScriptVarArrayValue(0, param_1, 1);
uVar1 = GetScriptVarArrayValue(NULL, param_1, 0);
iVar2 = GetScriptVarArrayValue(NULL, param_1, 1);
if (((uVar1 == param_2 && (((param_3 < 0) || (iVar2 == param_3)))))) {
return TRUE;
}
@ -217,8 +217,8 @@ bool8 ScriptVarScenarioAfter(s16 param_1,u32 param_2,s32 param_3)
s32 uVar1;
s32 iVar2;
uVar1 = GetScriptVarArrayValue(0, param_1, 0);
iVar2 = GetScriptVarArrayValue(0, param_1, 1);
uVar1 = GetScriptVarArrayValue(NULL, param_1, 0);
iVar2 = GetScriptVarArrayValue(NULL, param_1, 1);
if ((uVar1 != 0x3a) &&
((uVar1 > param_2 || (((param_3 >= 0 && (uVar1 == param_2)) && (iVar2 > param_3)))))) {
return TRUE;
@ -239,7 +239,7 @@ void sub_8001D88(void)
if (ScriptVarScenarioAfter(3,0xf,7) != 0) {
ScenarioCalc(4,0x1f,0);
sub_8097418(0xe,1);
SetScriptVarValue(0,0x28,2);
SetScriptVarValue(NULL,0x28,2);
}
else {
if ((ScriptVarScenarioEqual(4,0,0)) && (ScriptVarScenarioAfter(3,0xf,3))) {
@ -622,7 +622,7 @@ bool8 sub_8002718(u8 *r0)
void sub_8002758(s32 r0)
{
UpdateScriptVarWithImmediate(0, 0x1, r0, 0x9);
UpdateScriptVarWithImmediate(NULL, 0x1, r0, 0x9);
}
u8 sub_800276C(void)

24
src/ground_main.c
View File

@ -90,26 +90,26 @@ void sub_8098BDC(void)
void sub_8098C58(void)
{
s32 temp, temp2;
ClearScriptVarArray(0, 54);
ClearScriptVarArray(0, 57);
ClearScriptVarArray(NULL, 54);
ClearScriptVarArray(NULL, 57);
sub_809CB8C();
sub_8001D88();
if (GetScriptVarValue(0, 42) != 0) {
temp = GetScriptVarValue(0, 41);
if (GetScriptVarValue(NULL, 42) != 0) {
temp = GetScriptVarValue(NULL, 41);
temp++;
if (temp > 15)
temp = 0;
SetScriptVarValue(0, 41, temp);
SetScriptVarValue(0, 42, 0);
SetScriptVarValue(NULL, 41, temp);
SetScriptVarValue(NULL, 42, 0);
}
temp2 = GetScriptVarArrayValue(0, 66, 0);
temp2 = GetScriptVarArrayValue(NULL, 66, 0);
if (temp2 <= 0)
temp2 = 1;
temp2--;
SetScriptVarArrayValue(0, 66, 0, temp2);
SetScriptVarArrayValue(NULL, 66, 0, temp2);
sub_8098CC8();
}
@ -275,12 +275,12 @@ bool8 GetScriptMode(void)
s16 sub_8098FA0(void)
{
return GetScriptVarValue(0, 0x11);
return GetScriptVarValue(NULL, 0x11);
}
const char *sub_8098FB4(void)
{
return sub_80A2B18(GetScriptVarValue(0, 0x11));
return sub_80A2B18(GetScriptVarValue(NULL, 0x11));
}
s16 sub_8098FCC(u32 unused)
@ -290,12 +290,12 @@ s16 sub_8098FCC(u32 unused)
s32 iVar6;
const DungeonInfo *iVar3;
iVar5 = (s16)GetScriptVarValue(0,0x13);
iVar5 = (s16)GetScriptVarValue(NULL,0x13);
iVar6 = iVar5;
if (iVar5 == -1) return 0xC;
if (iVar5 == 0x51)
iVar4 = (s16)GetScriptVarValue(0,0x14);
iVar4 = (s16)GetScriptVarValue(NULL,0x14);
else
iVar4 = iVar6;

4
src/ground_map.c
View File

@ -37,8 +37,8 @@ void FreeGroundMapAction(void)
void GroundMap_Reset(void)
{
ClearScriptVarArray(0, 0x37);
ClearScriptVarArray(0, 0x38);
ClearScriptVarArray(NULL, 0x37);
ClearScriptVarArray(NULL, 0x38);
ActionResetScriptData((Action *)gGroundMapAction, gUnknown_8117538);
if (gGroundMapDungeon_3001B70 != NULL) {

4
src/ground_map_2.c
View File

@ -52,7 +52,7 @@ void sub_80A5EBC(void)
void sub_80A5EDC(u8 param_1)
{
SetScriptVarValue(0, 27, -1);
SetScriptVarValue(NULL, 27, -1);
gUnknown_3001B74->unk0 = -1;
gUnknown_3001B74->unk2 = param_1;
@ -84,7 +84,7 @@ void GroundWeather_Select(s16 param_1)
iVar2 = param_1;
iVar3 = iVar2;
Log(0, gGroundWeatherSelect, iVar2, gUnknown_3001B74->unk2);
SetScriptVarValue(0, 27, iVar2);
SetScriptVarValue(NULL, 27, iVar2);
gUnknown_3001B74->unk0 = iVar2;
if (gUnknown_3001B74->unk2 == 0)

46
src/ground_script_1.c
View File

@ -215,7 +215,7 @@ s32 ExecuteScriptCommand(Action *action) {
}
case 0x02: {
s32 arg = (s16)curCmd.arg1;
if (arg == -1) arg = (s16)GetScriptVarValue(0, 19);
if (arg == -1) arg = (s16)GetScriptVarValue(NULL, 19);
if (ScriptLoggingEnabled(TRUE)) {
// " dungeon select %3d"
Log(1, gUnknown_81165F4, arg);
@ -247,7 +247,7 @@ s32 ExecuteScriptCommand(Action *action) {
}
return 2; // do action
} else {
SetScriptVarValue(0, 18, sub_80A26B8((s16)curCmd.arg1));
SetScriptVarValue(NULL, 18, sub_80A26B8((s16)curCmd.arg1));
action->scriptData.branchDiscriminant = 1;
return 2; // do action
}
@ -264,7 +264,7 @@ s32 ExecuteScriptCommand(Action *action) {
return 2;
}
} else {
SetScriptVarValue(0, 19, curCmd.arg1);
SetScriptVarValue(NULL, 19, curCmd.arg1);
action->scriptData.branchDiscriminant = 1;
return 2;
}
@ -276,9 +276,9 @@ s32 ExecuteScriptCommand(Action *action) {
case 0x07: {
s32 tmp = (s16)curCmd.arg1;
if (tmp == -1) {
tmp = (s16)GetScriptVarValue(0, 19);
tmp = (s16)GetScriptVarValue(NULL, 19);
} else {
SetScriptVarValue(0, 19, tmp);
SetScriptVarValue(NULL, 19, tmp);
}
if (ScriptLoggingEnabled(TRUE)) {
Log(1, gUnknown_811660C, tmp);
@ -310,8 +310,8 @@ s32 ExecuteScriptCommand(Action *action) {
gGroundConversion_811BAF4[gCurrentMap].text);
}
}
SetScriptVarValue(0,0x10,gCurrentMap);
SetScriptVarValue(0,0x11,gGroundConversion_811BAF4[gCurrentMap].unk2);
SetScriptVarValue(NULL,0x10,gCurrentMap);
SetScriptVarValue(NULL,0x11,gGroundConversion_811BAF4[gCurrentMap].unk2);
GroundSprite_Reset(gUnknown_2039A32);
sub_809D0BC();
DeleteGroundEvents();
@ -516,9 +516,9 @@ s32 ExecuteScriptCommand(Action *action) {
break;
}
case 0x1f: {
s32 a = (s16)GetScriptVarValue(0, 19);
s32 a = (s16)GetScriptVarValue(NULL, 19);
const DungeonInfo *ret1 = GetDungeonInfo_80A2608(a);
s32 thing = GetScriptVarArrayValue(0, 48, a) == 0 ? ret1->unk6 : ret1->unk8;
s32 thing = GetScriptVarArrayValue(NULL, 48, a) == 0 ? ret1->unk6 : ret1->unk8;
// fakematch: this is almost certainly a range check of the form 0x37 <= a && a < 0x48
// but that loses the s32 -> u16 cast. Inlines, macros, or other schenanigans are likely involved
if (!((u16)(a - 0x37) < 0x11) && (s16)sub_80A2750(a) == 1) {
@ -1001,10 +1001,10 @@ s32 ExecuteScriptCommand(Action *action) {
Position32 pos;
s32 height;
s32 dir;
pos.x = GetScriptVarArrayValue(0, 0x32, (u16)curCmd.arg1); // POSITION_X
pos.y = GetScriptVarArrayValue(0, 0x33, (u16)curCmd.arg1); // POSITION_Y
height = GetScriptVarArrayValue(0, 0x34, (u16)curCmd.arg1); // POSITION_HEIGHT
dir = (s8)GetScriptVarArrayValue(0, 0x35, (u16)curCmd.arg1); // POSITION_DIRECTION
pos.x = GetScriptVarArrayValue(NULL, 0x32, (u16)curCmd.arg1); // POSITION_X
pos.y = GetScriptVarArrayValue(NULL, 0x33, (u16)curCmd.arg1); // POSITION_Y
height = GetScriptVarArrayValue(NULL, 0x34, (u16)curCmd.arg1); // POSITION_HEIGHT
dir = (s8)GetScriptVarArrayValue(NULL, 0x35, (u16)curCmd.arg1); // POSITION_DIRECTION
action->callbacks->moveReal(action->parentObject, &pos);
action->callbacks->setPosHeight(action->parentObject, height);
action->scriptData.unk26 = dir;
@ -1024,10 +1024,10 @@ s32 ExecuteScriptCommand(Action *action) {
action->callbacks->getHitboxCenter(action->parentObject, &pos);
action->callbacks->getPosHeightAndUnk(action->parentObject, &height, &wat);
action->callbacks->getDirection(action->parentObject, &dir);
SetScriptVarArrayValue(0, 0x32, (u16)curCmd.arg1, pos.x);
SetScriptVarArrayValue(0, 0x33, (u16)curCmd.arg1, pos.y);
SetScriptVarArrayValue(0, 0x34, (u16)curCmd.arg1, height);
SetScriptVarArrayValue(0, 0x35, (u16)curCmd.arg1, dir);
SetScriptVarArrayValue(NULL, 0x32, (u16)curCmd.arg1, pos.x);
SetScriptVarArrayValue(NULL, 0x33, (u16)curCmd.arg1, pos.y);
SetScriptVarArrayValue(NULL, 0x34, (u16)curCmd.arg1, height);
SetScriptVarArrayValue(NULL, 0x35, (u16)curCmd.arg1, dir);
break;
}
case 0x60: {
@ -1466,12 +1466,12 @@ s32 ExecuteScriptCommand(Action *action) {
break;
}
case 0xab: {
SetScriptVarValue(0, 19, curCmd.arg1);
SetScriptVarValue(0, 22, curCmd.argShort);
SetScriptVarValue(NULL, 19, curCmd.arg1);
SetScriptVarValue(NULL, 22, curCmd.argShort);
break;
}
case 0xac: {
SetScriptVarValue(0, 28, curCmd.argShort);
SetScriptVarValue(NULL, 28, curCmd.argShort);
break;
}
case 0xad: {
@ -1499,7 +1499,7 @@ s32 ExecuteScriptCommand(Action *action) {
break;
}
case 0xb3: {
if ((u8)JudgeVarWithImmediate(0, curCmd.argShort, curCmd.arg1, 2)) {
if ((u8)JudgeVarWithImmediate(NULL, curCmd.argShort, curCmd.arg1, 2)) {
scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte);
}
break;
@ -1611,11 +1611,11 @@ s32 ExecuteScriptCommand(Action *action) {
break;
}
case 0xc4: {
val = GetScriptVarArrayValue(0, curCmd.argShort, 0);
val = GetScriptVarArrayValue(NULL, curCmd.argShort, 0);
break;
}
case 0xc5: {
val = GetScriptVarArrayValue(0, curCmd.argShort, 1);
val = GetScriptVarArrayValue(NULL, curCmd.argShort, 1);
break;
}
case 0xc6: {

2
src/load_screen.c
View File

@ -308,7 +308,7 @@ void DrawLoadScreenText(void)
switch(sub_8011C1C())
{
case 1:
switch(GetScriptVarValue(0,24))
switch(GetScriptVarValue(NULL,24))
{
default:
sprintfStatic(auStack356,gUnknown_80E7804,sub_8098FB4());