move non matching functions into corresponding game folder

src/game/sa1/stage/egg_rocket_transitions.c

@@ -51,7 +51,7 @@ void CreateEggRocketStageSeparation(CamCoord worldY)
 }
 
 // (91.87%) https://decomp.me/scratch/pMtZY
-NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_8028CE4.inc", void Task_8028CE4(void))
+NONMATCH("asm/non_matching/game/sa1/egg_rocket_trans__Task_8028CE4.inc", void Task_8028CE4(void))
 {
     EggRocketScreenShake *shake = TASK_DATA(gCurTask);
     u32 i;
@@ -189,7 +189,7 @@ void Task_8029070(void)
 }
 
 // (97.47%) https://decomp.me/scratch/CWQ2v
-NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_8029194.inc", void Task_8029194(void))
+NONMATCH("asm/non_matching/game/sa1/egg_rocket_trans__Task_8029194.inc", void Task_8029194(void))
 {
     EggRocketScreenShake *shake = TASK_DATA(gCurTask);
     s16 ip;
@@ -282,7 +282,7 @@ END_NONMATCH
 
 // Similar to Task_8029194
 // (97.55%) https://decomp.me/scratch/o2r28
-NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_80294A8.inc", void Task_80294A8(void))
+NONMATCH("asm/non_matching/game/sa1/egg_rocket_trans__Task_80294A8.inc", void Task_80294A8(void))
 {
     EggRocketScreenShake *shake = TASK_DATA(gCurTask);
     u32 i;

src/game/sa1/stage/ui_rendering.c

@@ -100,7 +100,7 @@ void sub_80528AC(Strc_80528AC *param0)
 }
 
 // (86.06%) https://decomp.me/scratch/3jubn
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052AA4.inc", void sub_8052AA4(void))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_8052AA4.inc", void sub_8052AA4(void))
 {
     struct Strc_30063F0 *list = &gUnknown_030063C0;
     struct Strc_30063F0 *curr;
@@ -140,7 +140,9 @@ NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052AA4.inc", void sub_8052AA
 }
 END_NONMATCH
 
-NONMATCH("asm/non_matching/game/gTask_3006240__unused_8052B84.inc", void unused_8052B84(s32 param0, u16 param1, u16 param2, u8 param3)) { }
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__unused_8052B84.inc", void unused_8052B84(s32 param0, u16 param1, u16 param2, u8 param3))
+{
+}
 END_NONMATCH
 
 void sub_8052C84(const char *param0, Strc_8052C84 *param1)
@@ -194,7 +196,7 @@ void sub_8052C84(const char *param0, Strc_8052C84 *param1)
 }
 
 // (97.98%) https://decomp.me/scratch/z75P3
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052D64.inc", void sub_8052D64(u8 *param0, Strc_8052C84 *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_8052D64.inc", void sub_8052D64(u8 *param0, Strc_8052C84 *param1))
 {
     Strc0 *strc0;
     u32 u8;
@@ -283,7 +285,7 @@ void sub_8052E40(u8 *param0, Strc_8052C84 *param1)
 
 // Unused?
 // (88.18%) https://decomp.me/scratch/i72oQ
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052EF0.inc", void sub_8052EF0(s32 param0, Strc_8052C84 *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_8052EF0.inc", void sub_8052EF0(s32 param0, Strc_8052C84 *param1))
 {
     s32 byteCount = 0;
     char sp00[10];
@@ -310,7 +312,7 @@ NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052EF0.inc", void sub_8052EF
 END_NONMATCH
 
 // (97.64%) https://decomp.me/scratch/8KTZ5
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052F78.inc", void sub_8052F78(const char *param0, GameOverB *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_8052F78.inc", void sub_8052F78(const char *param0, GameOverB *param1))
 {
     Strc0 *strc0;
     u32 u8;
@@ -376,7 +378,7 @@ NONMATCH("asm/non_matching/game/gTask_3006240__sub_8052F78.inc", void sub_8052F7
 END_NONMATCH
 
 // (97.61%) https://decomp.me/scratch/qWdSy
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_80530CC.inc", void sub_80530CC(const char *param0, GameOverB *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_80530CC.inc", void sub_80530CC(const char *param0, GameOverB *param1))
 {
     Strc0 *strc0;
     u32 u8;
@@ -442,7 +444,7 @@ NONMATCH("asm/non_matching/game/gTask_3006240__sub_80530CC.inc", void sub_80530C
 END_NONMATCH
 
 // (97.91%) https://decomp.me/scratch/3w39X
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_805321C.inc", void sub_805321C(u8 *param0, GameOverB *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_805321C.inc", void sub_805321C(u8 *param0, GameOverB *param1))
 {
     Strc0 *strc0;
     u32 u8;
@@ -510,7 +512,7 @@ END_NONMATCH
 // TODO: The 2nd parameter's type is just a guess!
 //
 // (94.91%) https://decomp.me/scratch/B60WP
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_8053370.inc", void sub_8053370(u8 *param0, GameOverB *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_8053370.inc", void sub_8053370(u8 *param0, GameOverB *param1))
 {
     Strc0 *strc0;
     u32 u8;
@@ -568,7 +570,7 @@ END_NONMATCH
 // TODO: The 2nd parameter's type is just a guess!
 //
 // (97.74%) https://decomp.me/scratch/fMp61
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_805345C.inc", void sub_805345C(u8 *param0, GameOverB *param1))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_805345C.inc", void sub_805345C(u8 *param0, GameOverB *param1))
 {
     Strc0 *strc0;
     u32 u8;
@@ -663,7 +665,7 @@ void sub_80535C8(struct Strc0 *inTask, u8 param1)
 }
 
 // (94.42%) https://decomp.me/scratch/QDnYo
-NONMATCH("asm/non_matching/game/gTask_3006240__sub_80535FC.inc", void sub_80535FC(void))
+NONMATCH("asm/non_matching/game/sa1/gTask_3006240__sub_80535FC.inc", void sub_80535FC(void))
 {
     if (gTask_03006240 == NULL) {
         struct Strc_3006250 *zeroth = &gUnknown_03006250[0];

src/game/sa1/ui/character_select.c

@@ -110,7 +110,8 @@ const u8 gUnknown_08688578[4] = { 3, 0, 2, 1 };
 extern void sub_805321C(u8 *param0, GameOverB *param1);
 
 // (99.35%) https://decomp.me/scratch/Gn2Mk
-NONMATCH("asm/non_matching/game/char_select__CreateCharacterSelectionScreen.inc", void CreateCharacterSelectionScreen(u8 selectedCharacter))
+NONMATCH("asm/non_matching/game/sa1/char_select__CreateCharacterSelectionScreen.inc",
+         void CreateCharacterSelectionScreen(u8 selectedCharacter))
 {
     Strc_80528AC gfx;
     s32 sp38;
@@ -443,7 +444,7 @@ void Task_8059F9C(void)
 }
 
 // (99.88%) https://decomp.me/scratch/WGT0R
-NONMATCH("asm/non_matching/game/char_select__Task_805A060.inc", void Task_805A060())
+NONMATCH("asm/non_matching/game/sa1/char_select__Task_805A060.inc", void Task_805A060())
 {
     CharSelect_20 *sp0;
     CharSelect_44 *sp4;
@@ -634,7 +635,7 @@ NONMATCH("asm/non_matching/game/char_select__Task_805A060.inc", void Task_805A06
 END_NONMATCH
 
 // (89.07%) https://decomp.me/scratch/IYC6j
-NONMATCH("asm/non_matching/game/char_select__Task_805A54C.inc", void Task_805A54C())
+NONMATCH("asm/non_matching/game/sa1/char_select__Task_805A54C.inc", void Task_805A54C())
 {
     s32 temp_r0_2;
     u32 i;
@@ -720,7 +721,7 @@ NONMATCH("asm/non_matching/game/char_select__Task_805A54C.inc", void Task_805A54
 END_NONMATCH
 
 // (87.54%) https://decomp.me/scratch/MOYRn
-NONMATCH("asm/non_matching/game/char_select__Task_805A798.inc", void Task_805A798())
+NONMATCH("asm/non_matching/game/sa1/char_select__Task_805A798.inc", void Task_805A798())
 {
     s32 temp_r0_2;
     u32 i;
@@ -1240,7 +1241,7 @@ asm("gUnknown_08688602:");
 #endif
 
 // (94.92%) https://decomp.me/scratch/I8ghH
-NONMATCH("asm/non_matching/game/char_select__sub_805B324.inc", void sub_805B324())
+NONMATCH("asm/non_matching/game/sa1/char_select__sub_805B324.inc", void sub_805B324())
 {
     Sprite *temp_r4;
     Sprite *temp_r4_2;

src/game/sa1/ui/intro_animation.c

@@ -577,7 +577,7 @@ static inline u32 maskRedColor(u32 c)
 }
 
 // (99.14%) https://decomp.me/scratch/gBBjz
-NONMATCH("asm/non_matching/game/intro_anim__Task_80640C8.inc", void Task_80640C8())
+NONMATCH("asm/non_matching/game/sa1/intro_anim__Task_80640C8.inc", void Task_80640C8())
 {
     s16 *temp_r2;
     s16 temp_r0;

src/game/sa2/stage/player_super_sonic.c

@@ -343,7 +343,7 @@ static void Task_802BC10(void)
 }
 
 // (99.25%) https://decomp.me/scratch/2dbbE
-NONMATCH("asm/non_matching/game/super_sonic__sub_802BCCC.inc", void sub_802BCCC(struct SuperSonic *sonic))
+NONMATCH("asm/non_matching/game/sa2/super_sonic__sub_802BCCC.inc", void sub_802BCCC(struct SuperSonic *sonic))
 {
     s32 ssx, ssx2;
     u8 i;