pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Script.uniqueID -> id

Browse Source
This commit is contained in:
Alex Bates 2020-10-20 07:40:15 +01:00
parent ef7ddd6773
commit 8077a8f3cb
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/code_1f580_len_1940.c
View File

@ -72,7 +72,7 @@ ApiStatus DoNpcDefeat(ScriptInstance* script, s32 isInitialCall) {
temp_s1->currentAnim = owner->animList[6]; temp_s1->currentAnim = owner->animList[6];
newScript = start_script(&SCRIPT_NpcDefeat, 10, 0); newScript = start_script(&SCRIPT_NpcDefeat, 10, 0);
owner->defeatScript = newScript; owner->defeatScript = newScript;
owner->defeatScriptID = newScript->uniqueID; owner->defeatScriptID = newScript->id;
newScript->ownerActorID = owner; newScript->ownerActorID = owner;
newScript->ownerID = owner->npcID; newScript->ownerID = owner->npcID;
newScript->groupFlags = owner->scriptGroup; newScript->groupFlags = owner->scriptGroup;
@ -148,7 +148,7 @@ ApiStatus RestartNpcAI(ScriptInstance* script, s32 isInitialCall) {
npc->unk_C8 = 100; npc->unk_C8 = 100;
newScript = start_script(npc->aiBytecode, 10, 0); newScript = start_script(npc->aiBytecode, 10, 0);
npc->aiScript = newScript; npc->aiScript = newScript;
npc->aiScriptID = newScript->uniqueID; npc->aiScriptID = newScript->id;
newScript->ownerActorID = npc; newScript->ownerActorID = npc;
newScript->ownerID = script->ownerID; newScript->ownerID = script->ownerID;
newScript->groupFlags = groupFlags; newScript->groupFlags = groupFlags;
@ -222,7 +222,7 @@ ApiStatus RestartNpcAux(ScriptInstance* script, s32 isInitialCall) {
newScript = start_script(npc->auxBytecode, 10, 0); newScript = start_script(npc->auxBytecode, 10, 0);
npc->auxScript = newScript; npc->auxScript = newScript;
npc->auxScriptID = newScript->uniqueID; npc->auxScriptID = newScript->id;
newScript->ownerActorID = npc; newScript->ownerActorID = npc;
newScript->ownerID = npcId; newScript->ownerID = npcId;
newScript->groupFlags = groupFlags; newScript->groupFlags = groupFlags;

28
src/code_e79b0_len_1920.c
View File

@ -23,7 +23,7 @@ void sort_scripts(void) {
if (curScript != NULL) { if (curScript != NULL) {
if (curScript->state != 0) { if (curScript->state != 0) {
scriptIndexList[numValidScripts] = i; scriptIndexList[numValidScripts] = i;
scriptIdList[numValidScripts] = curScript->uniqueID; scriptIdList[numValidScripts] = curScript->id;
numValidScripts++; numValidScripts++;
} }
} }
@ -189,7 +189,7 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta
newScript->blockingParent = NULL; newScript->blockingParent = NULL;
newScript->childScript = NULL; newScript->childScript = NULL;
newScript->parentScript = NULL; newScript->parentScript = NULL;
newScript->uniqueID = gStaticScriptCounter++; newScript->id = gStaticScriptCounter++;
newScript->ownerActorID = -1; newScript->ownerActorID = -1;
newScript->ownerID = -1; newScript->ownerID = -1;
newScript->loopDepth = -1; newScript->loopDepth = -1;
@ -215,7 +215,7 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta
if ((D_802D9CA4 != 0) && ((newScript->state & 0x20) != 0)) { if ((D_802D9CA4 != 0) && ((newScript->state & 0x20) != 0)) {
scriptListCount = gScriptListCount++; scriptListCount = gScriptListCount++;
gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIndexList[scriptListCount] = curScriptIndex;
gScriptIdList[scriptListCount] = newScript->uniqueID; gScriptIdList[scriptListCount] = newScript->id;
} }
func_802C3390(newScript); func_802C3390(newScript);
{ {
@ -260,7 +260,7 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, s32 in
newScript->blockingParent = NULL; newScript->blockingParent = NULL;
newScript->childScript = NULL; newScript->childScript = NULL;
newScript->parentScript = NULL; newScript->parentScript = NULL;
newScript->uniqueID = gStaticScriptCounter++; newScript->id = gStaticScriptCounter++;
newScript->ownerActorID = -1; newScript->ownerActorID = -1;
newScript->ownerID = -1; newScript->ownerID = -1;
newScript->loopDepth = -1; newScript->loopDepth = -1;
@ -286,7 +286,7 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, s32 in
if ((D_802D9CA4 != 0) && ((newScript->state & 0x20) != 0)) { if ((D_802D9CA4 != 0) && ((newScript->state & 0x20) != 0)) {
scriptListCount = gScriptListCount++; scriptListCount = gScriptListCount++;
gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIndexList[scriptListCount] = curScriptIndex;
gScriptIdList[scriptListCount] = newScript->uniqueID; gScriptIdList[scriptListCount] = newScript->id;
} }
func_802C3390(newScript); func_802C3390(newScript);
@ -333,7 +333,7 @@ ScriptInstance* func_802C39F8(ScriptInstance* parentScript, Bytecode* nextLine,
child->parentScript = parentScript; child->parentScript = parentScript;
child->childScript = NULL; child->childScript = NULL;
child->priority = parentScript->priority; child->priority = parentScript->priority;
child->uniqueID = gStaticScriptCounter++; child->id = gStaticScriptCounter++;
child->ownerActorID = parentScript->ownerActorID; child->ownerActorID = parentScript->ownerActorID;
child->ownerID = parentScript->ownerID; child->ownerID = parentScript->ownerID;
child->loopDepth = -1; child->loopDepth = -1;
@ -360,7 +360,7 @@ ScriptInstance* func_802C39F8(ScriptInstance* parentScript, Bytecode* nextLine,
if (D_802D9CA4 != 0) { if (D_802D9CA4 != 0) {
scriptListCount = gScriptListCount++; scriptListCount = gScriptListCount++;
gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIndexList[scriptListCount] = curScriptIndex;
gScriptIdList[scriptListCount] = child->uniqueID; gScriptIdList[scriptListCount] = child->id;
} }
temp6 = &gStaticScriptCounter; temp6 = &gStaticScriptCounter;
@ -502,7 +502,7 @@ void kill_script_by_ID(s32 id) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { if (scriptContextPtr != NULL && scriptContextPtr->id == id) {
kill_script(scriptContextPtr); kill_script(scriptContextPtr);
} }
} }
@ -527,7 +527,7 @@ s32 does_script_exist(s32 id) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { if (scriptContextPtr != NULL && scriptContextPtr->id == id) {
return 1; return 1;
} }
} }
@ -638,7 +638,7 @@ s32 suspend_all_script(s32 id) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { if (scriptContextPtr != NULL && scriptContextPtr->id == id) {
suspend_group_script(scriptContextPtr, 0xEF); suspend_group_script(scriptContextPtr, 0xEF);
} }
} }
@ -650,7 +650,7 @@ s32 resume_all_script(s32 id) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { if (scriptContextPtr != NULL && scriptContextPtr->id == id) {
resume_group_script(scriptContextPtr, 0xEF); resume_group_script(scriptContextPtr, 0xEF);
} }
} }
@ -662,7 +662,7 @@ void suspend_group_script_index(s32 id, s32 groupFlags) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { if (scriptContextPtr != NULL && scriptContextPtr->id == id) {
suspend_group_script(scriptContextPtr, groupFlags); suspend_group_script(scriptContextPtr, groupFlags);
} }
} }
@ -674,7 +674,7 @@ void resume_group_script_index(s32 id, s32 groupFlags) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { if (scriptContextPtr != NULL && scriptContextPtr->id == id) {
resume_group_script(scriptContextPtr, groupFlags); resume_group_script(scriptContextPtr, groupFlags);
} }
} }
@ -739,7 +739,7 @@ ScriptInstance* get_script_by_id(s32 id) {
for (i = 0; i < MAX_SCRIPTS; i++) { for (i = 0; i < MAX_SCRIPTS; i++) {
if ((*gCurrentScriptListPtr)[i] != NULL) { if ((*gCurrentScriptListPtr)[i] != NULL) {
scriptContextPtr = (*gCurrentScriptListPtr)[i]; scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr->uniqueID == id) { if (scriptContextPtr->id == id) {
return scriptContextPtr; return scriptContextPtr;
} }
} }