Some alignment

asm/macros/music_voice.inc

@@ -109,6 +109,7 @@ mAlignWord
 	.endm
 
 	.macro voice_keysplit voice_group_pointer, keysplit_table_pointer
+mAlignWord
 	.byte 0x40, 0, 0, 0
 mAlignWord
 	mPtr \voice_group_pointer
@@ -116,6 +117,7 @@ mAlignWord
 	.endm
 
 	.macro voice_keysplit_all voice_group_pointer
+mAlignWord
 	.byte 0x80, 0, 0, 0
 mAlignWord
 	mPtr \voice_group_pointer

include/task.h

@@ -48,7 +48,7 @@ typedef void *IwramData;
 #define TASK_x0004            0x0004
 #define TASK_USE_EWRAM        0x0010
 
-#define USE_SA2_TASK_SYSTEM ((GAME == GAME_SA2) && !defined(NON_MATCHING))
+#define USE_SA2_TASK_SYSTEM (GAME == GAME_SA2)
 
 typedef struct Task {
     /* 0x00 */ TaskPtr parent;

src/game/stage/player.c

@@ -219,7 +219,7 @@ void SA2_LABEL(sub_80213C0)(u32 UNUSED characterId, u32 UNUSED levelId, Player *
 #endif
     }
 #if (GAME == GAME_SA1)
-    else {
+    else /* (playerID != PLAYER_1) */ {
         // here: playerID != 0
         p->spriteTask = TaskCreate(Task_8045B38, sizeof(player_0_Task), 0x3001, 0, TaskDestructor_Player);
         gt = (player_0_Task *)TASK_DATA(p->spriteTask);