Align task.h with SA3

Author: JaceCear

include/task.h

@@ -34,7 +34,7 @@ typedef void *IwramData;
 #define ENABLE_TASK_LOGGING !TRUE
 #else
 #define ENABLE_TASK_LOGGING TRUE
-#endif // !DEBUG
+#endif // !DEBUG && !TAS_TESTING
 
 #define CLEAR_TASK_MEMORY_ON_DESTROY TRUE
 #endif // PLATFORM_GBA
@@ -48,24 +48,29 @@ typedef void *IwramData;
 #define TASK_x0004            0x0004
 #define TASK_USE_EWRAM        0x0010
 
+#define USE_SA2_TASK_SYSTEM ((GAME < GAME_SA3) && !defined(NON_MATCHING))
+
 struct Task {
     /* 0x00 */ TaskPtr parent;
     /* 0x02 */ TaskPtr prev;
     /* 0x04 */ TaskPtr next;
     /* 0x06 */ IwramData data;
 #if PORTABLE
     u32 dataSize;
-#endif
+#endif // PORTABLE
     /* 0x08 */ TaskMain main;
     /* 0x0C */ TaskDestructor dtor;
     /* 0x10 */ u16 priority; // priority?
     /* 0x12 */ u16 flags; // 0x1  = active
                           // 0x2  = ???
                           // 0x10 = use ewram for struct
+#if USE_SA2_TASK_SYSTEM
     /* 0x14 */ u8 unk14;
     /* 0x15 */ u8 unk15;
     /* 0x16 */ u16 unk16;
     /* 0x18 */ u16 unk18;
+#endif // USE_SA2_TASK_SYSTEM
+
 #if ENABLE_TASK_LOGGING
     const char *name;
 #endif
@@ -79,7 +84,7 @@ struct IwramNode;
 
 typedef struct IwramNode *IwramNodePtr;
 typedef IwramNodePtr IwramNodePtr32;
-#endif
+#endif // PLATFORM_GBA
 
 #define IWRAM_PTR(ptr) TASK_PTR(ptr)
 
@@ -123,10 +128,10 @@ struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 fla
     })
 #else
 struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor);
-#endif
+#endif // ENABLE_TASK_LOGGING
 
 void TaskDestroy(struct Task *);
 void *IwramMalloc(u16);
 void TasksDestroyInPriorityRange(u16, u16);
 
-#endif
+#endif // GUARD_TASK_H