fix some lint issues

include/si.h

@@ -1,6 +1,9 @@
 #ifndef _SI_H_
 #define _SI_H_
 
+#include "ultra64.h"
+#include "types.h"
+
 #define SI_VAR_0 0xFE363C80
 
 /* Return type of si_execute_next_command */

include/types.h

@@ -1,6 +1,8 @@
 #ifndef _TYPES_H_
 #define _TYPES_H_
 
+#include "ultra64.h"
+
 #define UNK_TYPE s32
 #define UNK_PTR void*
 #define UNK_RET void

src/code_80850_len_3060.c

@@ -185,7 +185,6 @@ void sort_items(void) {
             }
         }
     }
-    return;
 }
 
 s32 add_badge(s32 itemID) {

src/code_e79b0_len_1920.c

@@ -48,7 +48,7 @@ INCLUDE_ASM("code_e79b0_len_1920", func_802C3EE4);
 
 INCLUDE_ASM("code_e79b0_len_1920", kill_script);
 
-void* kill_script_by_ID(s32 id) {
+void kill_script_by_ID(s32 id) {
     s32 i;
     ScriptInstance* scriptContextPtr;
 
@@ -60,7 +60,7 @@ void* kill_script_by_ID(s32 id) {
     }
 }
 
-s32 kill_all_scripts(void) {
+void kill_all_scripts(void) {
     s32 i;
     ScriptInstance* scriptContextPtr;
 
@@ -70,7 +70,6 @@ s32 kill_all_scripts(void) {
             kill_script(scriptContextPtr);
         }
     }
-    return;
 }
 
 s32 does_script_exist(s32 id) {

src/code_e92d0_len_5da0.c

@@ -255,13 +255,13 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND);
 //INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND_const);
 ApiStatus si_handle_AND_const(ScriptInstance* script) {
     Bytecode* ptrReadPos = script->ptrReadPos;
-    // todo ???
-    s32 temp_s0 = ptrReadPos[0];
-    s32 temp_s2 = ptrReadPos[0];
 
-    temp_s0 = ptrReadPos[1];
-    // end todo
-    set_variable(script, temp_s2, temp_s0 & get_variable(script, temp_s2));
+    s32 constant = ptrReadPos[0]; // NOLINT
+    s32 var = ptrReadPos[0];
+
+    constant = ptrReadPos[1];
+
+    set_variable(script, var, constant & get_variable(script, var));
     return ApiStatus_DONE2;
 }
 
@@ -270,13 +270,13 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR);
 //INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR_const);
 ApiStatus si_handle_OR_const(ScriptInstance* script) {
     Bytecode* ptrReadPos = script->ptrReadPos;
-    // todo ???
-    s32 temp_s0 = ptrReadPos[0];
-    s32 temp_s2 = ptrReadPos[0];
 
-    temp_s0 = ptrReadPos[1];
-    // end todo
-    set_variable(script, temp_s2, temp_s0 | get_variable(script, temp_s2));
+    s32 constant = ptrReadPos[0]; // NOLINT
+    s32 var = ptrReadPos[0];
+
+    constant = ptrReadPos[1];
+
+    set_variable(script, var, constant | get_variable(script, var));
     return ApiStatus_DONE2;
 }
 

src/code_ebd0_len_6a0.c

@@ -42,7 +42,6 @@ s16 func_80033830(add_val) {
     return 0;
 }
 
-
 void func_80033874(void) {
     func_80137D88(0, (*gGameStatusPtr)->bootAlpha);
     func_80137E10(0, (*gGameStatusPtr)->bootBlue, (*gGameStatusPtr)->bootGreen, (*gGameStatusPtr)->bootRed);