From 9df06a74bab42f799a90a08bd3cf144e9550b540 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 22 Dec 2020 22:31:22 +0900 Subject: [PATCH] cleanup --- src/code_1f580_len_1940.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c index 60522e416e..4965b3997a 100644 --- a/src/code_1f580_len_1940.c +++ b/src/code_1f580_len_1940.c @@ -364,15 +364,10 @@ ApiStatus SetNpcVar(ScriptInstance* script, s32 isInitialCall) { ApiStatus GetNpcVar(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Enemy* npc; - NpcId npcID; - s32 varIdx; - s32 var3; - - npc = script->owner1.enemy; - npcID = get_variable(script, *args++); - varIdx = get_variable(script, *args++); - var3 = *args; + Enemy* npc = script->owner1.enemy; + NpcId npcID = get_variable(script, *args++); + s32 varIdx = get_variable(script, *args++); + s32 var3 = *args; if (npcID == NpcId_SELF) { npcID = npc->npcID; @@ -439,8 +434,8 @@ ApiStatus ClearDefeatedEnemies(ScriptInstance* script, s32 isInitialCall) { s32 i; s32 j; - for (i = 0; i < 60; i++) { - for (j = 0; j < 12; j++) { + for (i = 0; i < ARRAY_COUNT(currentEncounter->defeatFlags); i++) { + for (j = 0; j < ARRAY_COUNT(currentEncounter->defeatFlags[0]); j++) { currentEncounter->defeatFlags[i][j] = 0; } }