falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Ethan Roseman 2020-12-22 22:31:22 +09:00
parent 2754ed84fe
commit 9df06a74ba
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/code_1f580_len_1940.c
View File

@ -364,15 +364,10 @@ ApiStatus SetNpcVar(ScriptInstance* script, s32 isInitialCall) {
ApiStatus GetNpcVar(ScriptInstance* script, s32 isInitialCall) { ApiStatus GetNpcVar(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
Enemy* npc; Enemy* npc = script->owner1.enemy;
NpcId npcID; NpcId npcID = get_variable(script, *args++);
s32 varIdx; s32 varIdx = get_variable(script, *args++);
s32 var3; s32 var3 = *args;
npc = script->owner1.enemy;
npcID = get_variable(script, *args++);
varIdx = get_variable(script, *args++);
var3 = *args;
if (npcID == NpcId_SELF) { if (npcID == NpcId_SELF) {
npcID = npc->npcID; npcID = npc->npcID;
@ -439,8 +434,8 @@ ApiStatus ClearDefeatedEnemies(ScriptInstance* script, s32 isInitialCall) {
s32 i; s32 i;
s32 j; s32 j;
for (i = 0; i < 60; i++) { for (i = 0; i < ARRAY_COUNT(currentEncounter->defeatFlags); i++) {
for (j = 0; j < 12; j++) { for (j = 0; j < ARRAY_COUNT(currentEncounter->defeatFlags[0]); j++) {
currentEncounter->defeatFlags[i][j] = 0; currentEncounter->defeatFlags[i][j] = 0;
} }
} }