move data to overworld.c

6 files changed, 130 insertions, 117 deletions

diff --git a/data/rom4.s b/data/rom4.s
deleted file mode 100644
index 6f883c64c..000000000
--- a/data/rom4.s
+++ /dev/null
@@ -1,66 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gDummyWarpData:: @ 8216624
-	.byte -1
-	.byte -1
-	.byte -1
-	.space 1
-	.2byte -1
-	.2byte -1
-
-@ unused, unknown data
-	.byte 0xB0, 0x04, 0x00, 0x00
-	.byte 0x10, 0x0E, 0x00, 0x00
-	.byte 0xB0, 0x04, 0x00, 0x00
-	.byte 0x60, 0x09, 0x00, 0x00
-	.byte 0x32, 0x00, 0x00, 0x00
-	.byte 0x50, 0x00, 0x00, 0x00
-	.byte 0xD4, 0xFF, 0xFF, 0xFF
-	.byte 0x2C, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0821664C:: @ 821664C
-	.4byte  0,  0
-	.4byte  0,  1
-	.4byte  0, -1
-	.4byte -1,  0
-	.4byte  1,  0
-	.4byte -1,  1
-	.4byte  1,  1
-	.4byte -1, -1
-	.4byte  1, -1
-
-	.align 2
-gUnknown_08216694:: @ 8216694
-	.4byte REG_WIN0H
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-
-	.align 2
-gUnknown_082166A0:: @ 82166A0
-	.4byte sub_8055C68
-	.4byte sub_8055C88
-	.4byte sub_8055C8C
-
-	.align 2
-gUnknown_082166AC:: @ 82166AC
-	.4byte sub_8055CAC
-	.4byte sub_8055CB0
-	.4byte sub_8055CB0
-	.4byte sub_8055CB0
-	.4byte sub_8055CB0
-	.4byte sub_8055CAC
-	.4byte sub_8055CAC
-	.4byte sub_8055D18
-	.4byte sub_8055D18
-	.4byte sub_8055D18
-	.4byte sub_8055D18
-
-	.align 2
-gUnknown_082166D8:: @ 82166D8
-	.4byte sub_8055D30
-	.4byte sub_8055D38
diff --git a/include/overworld.h b/include/overworld.h
index 81f37ae8b..fcdc8ed97 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -22,7 +22,7 @@ struct UCoords32
     u32 x, y;
 };
 
-extern struct UCoords32 gUnknown_0821664C[];
+extern const struct UCoords32 gUnknown_0821664C[];
 extern void (*gFieldCallback)(void);
 
 // sub_8052F5C
diff --git a/include/unknown_task.h b/include/unknown_task.h
index dc07767d6..d7ac63931 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -1,14 +1,24 @@
 #ifndef GUARD_UNKNOWN_TASK_H
 #define GUARD_UNKNOWN_TASK_H
 
+struct UnknownTaskStruct
+{
+    volatile void *dest;
+    u32 control;
+    u8 unk8;
+    u8 unk9;
+};
+
 void remove_some_task(void);
 void remove_some_task(void);
 void dp12_8087EA4(void);
 void dp12_8087EA4(void);
-void sub_80895F8(u32 i, u32 i1, u32 i2);
-void sub_80895F8();
+//void sub_80895F8(u32 i, u32 i1, u32 i2);
+//void sub_80895F8();
+void sub_80895F8(struct UnknownTaskStruct unk);
 void sub_8089668(void);
 void sub_8089668();
-void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6);
+//void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6);
+u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7);
 
 #endif // GUARD_UNKNOWN_TASK_H
diff --git a/ld_script.txt b/ld_script.txt
index dc1f4752f..7648f98c7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -341,7 +341,7 @@ SECTIONS {
         data/trade.o(.rodata);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
-        data/rom4.o(.rodata);
+        src/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
         src/fieldmap.o(.rodata);
diff --git a/src/overworld.c b/src/overworld.c
index 119b25a79..c3b503a2f 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -62,24 +62,6 @@ struct UnkTVStruct
     u32 tv_field_4;
 };
 
-EWRAM_DATA struct WarpData gUnknown_020297F0 = {0};
-EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
-EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
-EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
-EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
-EWRAM_DATA static u16 sAmbientCrySpecies = 0;
-EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
-EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
-
-static u8 gUnknown_03000580[4];
-static u16 (*gUnknown_03000584)(u32);
-static u8 gUnknown_03000588;
-
-u16 word_3004858;
-void (*gFieldCallback)(void);
-u8 gUnknown_03004860;
-u8 gFieldLinkPlayerCount;
-
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
@@ -104,15 +86,109 @@ extern u8 TradeRoom_PromptToCancelLink[];
 extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
-extern u8 (*gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
-extern u8 (*gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
-extern void (*gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *);
-
 extern struct MapData * const gMapAttributes[];
 extern struct MapHeader * const * const gMapGroups[];
-extern const struct WarpData gDummyWarpData;
 extern s32 gMaxFlashLevel;
-extern u32 gUnknown_08216694[];
+
+EWRAM_DATA struct WarpData gUnknown_020297F0 = {0};
+EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
+EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
+EWRAM_DATA static u16 sAmbientCrySpecies = 0;
+EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
+EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
+
+static u8 gUnknown_03000580[4];
+static u16 (*gUnknown_03000584)(u32);
+static u8 gUnknown_03000588;
+
+u16 word_3004858;
+void (*gFieldCallback)(void);
+u8 gUnknown_03004860;
+u8 gFieldLinkPlayerCount;
+
+static const struct WarpData sDummyWarpData =
+{
+    .mapGroup = -1,
+    .mapNum = -1,
+    .warpId = -1,
+    .x = -1,
+    .y = -1,
+};
+
+static const u8 sUnusedData[] =
+{
+    0xB0, 0x04, 0x00, 0x00,
+    0x10, 0x0E, 0x00, 0x00,
+    0xB0, 0x04, 0x00, 0x00,
+    0x60, 0x09, 0x00, 0x00,
+    0x32, 0x00, 0x00, 0x00,
+    0x50, 0x00, 0x00, 0x00,
+    0xD4, 0xFF, 0xFF, 0xFF,
+    0x2C, 0x00, 0x00, 0x00,
+};
+
+const struct UCoords32 gUnknown_0821664C[] =
+{
+    { 0,  0},
+    { 0,  1},
+    { 0, -1},
+    {-1,  0},
+    { 1,  0},
+    {-1,  1},
+    { 1,  1},
+    {-1, -1},
+    { 1, -1},
+};
+
+const struct UnknownTaskStruct gUnknown_08216694 =
+{
+    (void *)REG_ADDR_WIN0H,
+    ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+    1,
+    0,
+};
+
+static u8 sub_8055C68(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C88(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C8C(struct LinkPlayerMapObject *, struct MapObject *, u8);
+
+static u8 (*const gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+{
+    sub_8055C68,
+    sub_8055C88,
+    sub_8055C8C,
+};
+
+static u8 sub_8055CAC(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055CB0(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055D18(struct LinkPlayerMapObject *, struct MapObject *, u8);
+
+static u8 (*const gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+{
+    sub_8055CAC,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CAC,
+    sub_8055CAC,
+    sub_8055D18,
+    sub_8055D18,
+    sub_8055D18,
+    sub_8055D18,
+};
+
+static void sub_8055D30(struct LinkPlayerMapObject *, struct MapObject *);
+static void sub_8055D38(struct LinkPlayerMapObject *, struct MapObject *);
+
+static void (*const gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *) =
+{
+    sub_8055D30,
+    sub_8055D38,
+};
+
 
 static void DoWhiteOut(void)
 {
@@ -274,8 +350,8 @@ static void warp_shift(void)
 {
     gUnknown_020297F0 = gSaveBlock1.location;
     gSaveBlock1.location = gUnknown_020297F8;
-    gUnknown_02029800 = gDummyWarpData;
-    gUnknown_02029808 = gDummyWarpData;
+    gUnknown_02029800 = sDummyWarpData;
+    gUnknown_02029808 = sDummyWarpData;
 }
 
 static void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
@@ -1335,7 +1411,7 @@ void sub_8054814(void)
     if (val)
     {
         sub_80815E0(val);
-        sub_80895F8(gUnknown_08216694[0], gUnknown_08216694[1], gUnknown_08216694[2]);
+        sub_80895F8(gUnknown_08216694);
     }
 }
 
@@ -2448,27 +2524,27 @@ void sub_8055BFC(u8 linkPlayerId, u8 a2)
     }
 }
 
-u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
 }
 
-u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return 1;
 }
 
-u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
 }
 
-u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return 0;
 }
 
-u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     s16 x, y;
 
@@ -2488,18 +2564,18 @@ u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *m
     }
 }
 
-u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     mapObj->mapobj_unk_19 = npc_something3(a3, mapObj->mapobj_unk_19);
     return 0;
 }
 
-void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
 {
     linkPlayerMapObj->mode = 0;
 }
 
-void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
 {
     mapObj->mapobj_unk_21--;
     linkPlayerMapObj->mode = 1;
diff --git a/src/unknown_task.c b/src/unknown_task.c
index 81b89ef92..5ec7fa6bc 100644
--- a/src/unknown_task.c
+++ b/src/unknown_task.c
@@ -2,11 +2,12 @@
 #include "data2.h"
 #include "task.h"
 #include "trig.h"
+#include "unknown_task.h"
 
 struct UnknownStruct1
 {
     void *src[2];
-    void *dest;
+    volatile void *dest;
     u32 unkC;
     void (*unk10)(void);
     u8 srcBank;
@@ -17,14 +18,6 @@ struct UnknownStruct1
     u8 filler19[0x7];
 };
 
-struct UnknownStruct2
-{
-    void *dest;
-    u32 control;
-    u8 unk8;
-    u8 unk9;
-};
-
 static void sub_80896F4(void);
 static void sub_8089714(void);
 
@@ -68,7 +61,7 @@ void dp12_8087EA4(void)
     gUnknown_03004DC0.taskId = 0xFF;
 }
 
-void sub_80895F8(struct UnknownStruct2 unk)
+void sub_80895F8(struct UnknownTaskStruct unk)
 {
     if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1))
     {
@@ -214,7 +207,7 @@ u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
 {
     int i;
     int offset;
-    struct UnknownStruct2 unk;
+    struct UnknownTaskStruct unk;
     u8 taskId;
 
     dp12_8087EA4();