Move some data to C

data/data_0_1_3.s

@@ -1,6 +0,0 @@
-	.section .rodata
-    .align 2 , 0
-
-    .global gUnknown_080BB484
-gUnknown_080BB484:
-    .byte 0x35, 0x4D, 0x65, 0x7D

data/data_0_1_4.s

@@ -12,7 +12,3 @@ gUnknown_080BB544:
     .short 0x0254, 0x0254
     .short 0x022F, 0x022F
     .short 0x022F, 0x0254
-
-    .global sChaoSpawnPositions
-sChaoSpawnPositions:
-    .incbin "baserom_sa1.gba", 0x000BB568, 0x80

ldscript.txt

@@ -305,7 +305,7 @@ SECTIONS {
         src/game/sa1_sa2_shared/unused_flash_task.o(.rodata);
         data/data_0_1_2.o(.rodata);
         src/game/multiplayer/multiplayer_event_mgr.o(.rodata);
-        data/data_0_1_3.o(.rodata);
+        src/game/multiplayer/results_b.o(.rodata);
         src/game/multiplayer/results.o(.rodata);
         src/game/multiplayer/finish.o(.rodata);
         src/game/multiboot/collect_rings/time_display.o(.rodata);
@@ -314,6 +314,7 @@ SECTIONS {
         src/game/interactables/platform_thin.o(.rodata);
         src/game/interactables/platform_crumbling.o(.rodata);
         data/data_0_1_4.o(.rodata);
+        src/game/mp_chao.o(.rodata);
         src/data/tilemap_data_0.o(.rodata);
         src/data/sprite_tables.o(.rodata);
         src/data/animations/animations.o(.rodata);

src/data/tileset_debug_ascii.c

@@ -2,8 +2,8 @@
 #include "data/tileset_debug_ascii.h"
 
 // Tiles used for debug strings, like the unused (in the retail version) Stage Select.
-#ifdef NON_MATCHING
-const u8 ALIGNED(8) Tileset_DebugAscii[] = INCBIN_U8("graphics/tilesets/debug_ascii/debug_ascii.4bpp");
-#else
+#ifndef NON_MATCHING
 const u8 ALIGNED(8) Tileset_DebugAscii[] = {};
+#else
+const u8 ALIGNED(8) Tileset_DebugAscii[] = INCBIN_U8("graphics/tilesets/debug_ascii/debug_ascii.4bpp");
 #endif

src/game/mp_chao.c

@@ -39,7 +39,48 @@ static void Task_8028A1C(void);
 static bool32 UpdateChaoPosition(CamCoord x, CamCoord y);
 static void TaskDestructor_Chao(struct Task *t);
 
-extern const u16 sChaoSpawnPositions[NUM_LEVEL_IDS_MP][SPAWN_INDEX_COUNT][2];
+const u16 sChaoSpawnPositions[NUM_LEVEL_IDS_MP][SPAWN_INDEX_COUNT][2] = { //
+    [ACT_CHAO_HUNT_A - NUM_LEVEL_IDS_SP] = {
+        { 906, 290 },
+        { 1250, 267 },
+        { 1348, 700 },
+        { 1054, 843 },
+        { 753, 889 },
+        { 475, 554 },
+        { 475, 1035 },
+        { 1740, 215 },
+    },
+    [ACT_CHAO_HUNT_B - NUM_LEVEL_IDS_SP] = {
+        { 817, 483 },
+        { 817, 815 },
+        { 1400, 286 },
+        { 1177, 864 },
+        { 1506, 579 },
+        { 404, 480 },
+        { 1594, 1009 },
+        { 1029, 482 },
+    },
+    [ACT_CHAO_HUNT_C - NUM_LEVEL_IDS_SP] = {
+        { 458, 192 },
+        { 447, 578 },
+        { 534, 864 },
+        { 332, 1248 },
+        { 1023, 1250 },
+        { 433, 1536 },
+        { 410, 1728 },
+        { 650, 1728 },
+    },
+    [ACT_CHAO_HUNT_D - NUM_LEVEL_IDS_SP] = {
+        { 633, 335 },
+        { 1289, 335 },
+        { 722, 576 },
+        { 1162, 576 },
+        { 945, 960 },
+        { 706, 1057 },
+        { 1219, 1057 },
+        { 1009, 1008 },
+    }
+};
 
 struct Task *CreateMultiplayerChao(u8 spawnIndex, u8 id)
 {

src/game/multiplayer/results_b.c

@@ -38,9 +38,10 @@ void Task_8018ECC(void);
 void Task_8019348(void);
 void Task_80196FC(void);
 
-extern u8 gUnknown_080BB484[4];
 extern void sub_8062F90(void);
 
+const u8 gUnknown_080BB484[4] = { 53, 77, 101, 125 };
+
 void sub_8018AE0()
 {
     void *sp4;

src/game/sa1_sa2_shared/collision.c

@@ -905,7 +905,7 @@ u32 Coll_Player_SkatingStone(Sprite *s, CamCoord worldX, CamCoord worldY, Player
 
 // sa2__sub_800C060
 // 'Coll_Player_PlatformCrumbling' name from SA2, called by many Entities in SA1!
-// (86.62%) https://decomp.me/scratch/icjnK
+// (86.62%) https://decomp.me/scratch/kyp0r
 NONMATCH("asm/non_matching/game/sa1_sa2_shared/collision__sa2__800C060.inc",
          u32 Coll_Player_PlatformCrumbling(Sprite *s, CamCoord sx, CamCoord sy, Player *p))
 {