Fix misc 25 (#2829)

* #ifndef ENVIRONMENT_H_ -> #ifndef ENVIRONMENT_H (remove trailing underscore)

* rm from makefile suggestion about additional assets/ folder (just use assets/)

* BgCheck_AnyLineTest 1-3 : change 0/1 args in calls to false/true

* func_8083C6B8 returns bool

* parens cleanup

* fix typos

* cleanup UNK_TYPE uses

* fix ACTOR_ID_MAX value comment

* EnDh.limbRotTable -> morphTable

* some xml formatting

* bool -> s32

* shadowAlpha = 0xFF -> 255

* EnRu1_SetPlatformCamSetting/EnRu1_GetPlatformCamSetting: use CAM_SET_

* rm leading & in extracted references to jfif data arrays

* remove references to zapd

* gPoeComposerFlatHeadDL_000060E0_Tex -> object_po_composer_000060E0_Tex in HACK_no_warn_bad_dims_Texs

* correct SKYBOX_CUTSCENE_MAP comment

5 files changed, 13 insertions, 13 deletions

diff --git a/include/actor_profile.h b/include/actor_profile.h
index d02ce03cf..8d402d971 100644
--- a/include/actor_profile.h
+++ b/include/actor_profile.h
@@ -12,7 +12,7 @@ struct PlayState;
 
 typedef enum ActorID {
     #include "tables/actor_table.h"
-    /* 0x0192 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX"
+    /* 0x01D7 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX"
 } ActorID;
 
 #undef DEFINE_ACTOR
diff --git a/include/environment.h b/include/environment.h
index 43ba0c6d4..97d8a3b48 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -1,5 +1,5 @@
-#ifndef ENVIRONMENT_H_
-#define ENVIRONMENT_H_
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
 
 #include "z_math.h"
 #include "light.h"
diff --git a/include/n64dd.h b/include/n64dd.h
index e5b1b7aa3..f0028750c 100644
--- a/include/n64dd.h
+++ b/include/n64dd.h
@@ -72,8 +72,8 @@ typedef struct struct_801E0D18 {
     /* 0x00 */ LEOCmd unk_00;
     /* 0x1C */ OSMesgQueue unk_1C;
     /* 0x38 */ LEODiskID diskId;
-    /* 0x58 */ UNK_TYPE unk_58;
-    /* 0x5C */ UNK_TYPE unk_5C;
+    /* 0x58 */ s32 unk_58;
+    /* 0x5C */ s32 unk_5C;
     /* 0x60 */ u32 unk_60;
     /* 0x64 */ u8 unk_64;
     /* 0x65 */ u8 unk_65;
diff --git a/include/padmgr.h b/include/padmgr.h
index 9859b501a..526d1cce7 100644
--- a/include/padmgr.h
+++ b/include/padmgr.h
@@ -71,12 +71,12 @@ void PadMgr_RumbleSet(PadMgr* padMgr, u8* enable);
  * @param callback callback to run before rumble state is updated for the current VI
  * @param arg the argument to pass to the callback
  *
- * @see PADMGR_UNSET_RETRACE_CALLACK
+ * @see PADMGR_UNSET_RETRACE_CALLBACK
  */
-#define PADMGR_SET_RETRACE_CALLACK(padmgr, callback, arg) \
-    do {                                                  \
-        (padmgr)->retraceCallback = (callback);           \
-        (padmgr)->retraceCallbackArg = (arg);             \
+#define PADMGR_SET_RETRACE_CALLBACK(padmgr, callback, arg) \
+    do {                                                   \
+        (padmgr)->retraceCallback = (callback);            \
+        (padmgr)->retraceCallbackArg = (arg);              \
     } while (0)
 
 /**
@@ -85,9 +85,9 @@ void PadMgr_RumbleSet(PadMgr* padMgr, u8* enable);
  * @param callback the callback to unset, if it is set
  * @param arg the argument to unset, if it is set
  *
- * @see PADMGR_SET_RETRACE_CALLACK
+ * @see PADMGR_SET_RETRACE_CALLBACK
  */
-#define PADMGR_UNSET_RETRACE_CALLACK(padmgr, callback, arg)                                 \
+#define PADMGR_UNSET_RETRACE_CALLBACK(padmgr, callback, arg)                                \
     if ((padmgr)->retraceCallback == (callback) && (padmgr)->retraceCallbackArg == (arg)) { \
         (padmgr)->retraceCallback = NULL;                                                   \
         (padmgr)->retraceCallbackArg = NULL;                                                \
diff --git a/include/sched.h b/include/sched.h
index bf204bc6d..d588943d0 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -68,7 +68,7 @@ typedef struct Scheduler {
 } Scheduler; // size = 0x258
 
 void Sched_Notify(Scheduler* sc);
-void Sched_Init(Scheduler* sc, void* stack, OSPri priority, u8 viModeType, UNK_TYPE arg4, IrqMgr* irqMgr);
+void Sched_Init(Scheduler* sc, void* stack, OSPri priority, u8 viModeType, s32 arg4, IrqMgr* irqMgr);
 void Sched_FlushTaskQueue(void);
 
 extern Scheduler gScheduler;