Match DLL 30, clean up DLL 29, 30

Author: Francessco121

export_symbol_addrs.txt

@@ -302,7 +302,7 @@ func_80014C60 = 0x8000012D;
 osBbCardChange = 0x8000012E;
 func_80014BBC = 0x8000012F;
 func_800142F0 = 0x80000130;
-gDLL_30_tasktext = 0x80000131;
+gDLL_30_task = 0x80000131;
 func_80010158 = 0x80000132;
 func_800382AC = 0x80000133;
 func_80014B6C = 0x80000134;

include/dll.h

@@ -2,7 +2,7 @@
 #define _DLL_H
 
 #include "dlls/engine/29_gplay.h"
-#include "dlls/engine/30_tasktext.h"
+#include "dlls/engine/30_task.h"
 #include "dlls/engine/31_flash.h"
 
 #include "dll_def.h"
@@ -42,6 +42,7 @@ enum DLL_ID {
     DLL_WATERFX   = 24,
     DLL_CURVES    = 26,
     DLL_GPLAY     = 29,
+    DLL_TASK      = 30,
     DLL_FLASH     = 31,
     DLL_MINIMAP   = 59,
     DLL_LINK      = 74,
@@ -54,7 +55,7 @@ enum DLL_ID {
 // their global variable instead of from loading the DLL.
 
 extern DLLInst_29_gplay *gDLL_29_gplay;
-extern DLLInst_30_tasktext *gDLL_30_tasktext;
+extern DLLInst_30_task *gDLL_30_task;
 extern DLLInst_31_flash *gDLL_31_flash;
 extern DLLInst_Unknown
     *gDLL_28,

include/dlls/engine/30_task.h

@@ -0,0 +1,16 @@
+#ifndef _DLLS_30_H
+#define _DLLS_30_H
+
+#include <PR/ultratypes.h>
+#include "dll_def.h"
+
+DLL_INTERFACE_BEGIN(30_task)
+    void (*load_recently_completed)();
+    void (*mark_task_completed)(u8 task);
+    u8 (*get_num_recently_completed)();
+    void (*func_390)(u8 param1);
+    void (*func_3F8)();
+    s16 (*get_completion_percentage)();
+DLL_INTERFACE_END()
+
+#endif //_DLLS_30_H

include/dlls/engine/30_tasktext.h

@@ -19,6 +19,7 @@ void update_PlayerPosBuffer(void);
 TActor * get_player(void);
 
 s32 read_file_region(u32 id, void *dst, u32 offset, s32 size);
+void queue_load_file_region_to_ptr(void **dest, s32 fileId, s32 offset, s32 length);
 
 void dl_get_debug_info2(Gfx*, u32*, char**, u32*, s32*, u32*, char**, u32*, s32*);
 void dl_segment(Gfx **gdl, u32 segment, void *base);
@@ -48,8 +49,8 @@ s32 func_80023D30(TActor*,s32,f32,s32);
 s32 func_80024108(TActor*,f32,f32,s32);
 s32 func_80025F40(TActor*,s32,s32,s32);
 
-s32 get_gplay_bitstring(s32 entry);
-void set_gplay_bitstring(s32 entry, s32 value);
+u32 get_gplay_bitstring(s32 entry);
+void set_gplay_bitstring(s32 entry, u32 value);
 
 void draw_actor(TActor*,s32,s32,s32,s32,float);
 

include/functions.h

@@ -5,10 +5,10 @@ typedef struct {
     // Start bit index
     u16 start;
     // bits 0-4: length in bits (minus 1)
-    // bit 5: flag
+    // bit 5: has task
     // bits 6-7: which bitstring
     u8 field_0x2;
-    u8 field_0x3;
+    u8 task;
 } BitTableEntry;
 
 extern BitTableEntry *gFile_BITTABLE;

include/game/gamebits.h

@@ -1,7 +1,7 @@
 # engine
 16 = engine/16
 29 = engine/29_gplay
-30 = engine/30_tasktext
+30 = engine/30_task
 31 = engine/31_flash
 82 = engine/82
 83 = engine/83

src/dlls/dlls.txt

@@ -3,6 +3,7 @@
 #include "game/actor/actor.h"
 #include "sys/dll.h"
 #include "sys/math.h"
+#include "sys/fs.h"
 #include "variables.h"
 #include "functions.h"
 #include "dll.h"
@@ -66,7 +67,7 @@ static void gplay_func_1314();
 void gplay_func_139C(s32 param1, s32 param2);
 void gplay_func_15B8(s32 param1);
 
-/*export*/ void gplay_ctor(DLLFile *self)  {
+void gplay_ctor(DLLFile *self)  {
     bss_0 = (FlashStruct*)malloc(sizeof(FlashStruct), 0xFFFF00FF, NULL);
     gplay_func_1314();
     bss_4 = NULL;
@@ -75,7 +76,7 @@ void gplay_func_15B8(s32 param1);
     bss_1A50[0] = -1;
 }
 
-/*export*/ void gplay_dtor(DLLFile *self)  {
+void gplay_dtor(DLLFile *self)  {
     free(bss_0);
     if (bss_4 != NULL) {
         free(bss_4);
@@ -188,10 +189,10 @@ s32 gplay_func_3E4(s8 param1, u8 param2) {
         if (param1 < 4) {
             bss_183C = param1;
 
-            flashPtr = (FlashStruct*)malloc(0x1800, 0xFFFF00FF, NULL);
+            flashPtr = (FlashStruct*)malloc(sizeof(FlashStruct), 0xFFFF00FF, NULL);
 
-            var1 = gDLL_31_flash->exports->load_game(bss_0, param1, 0x1800, 1);
-            var2 = gDLL_31_flash->exports->load_game(flashPtr, param1 + 4, 0x1800, 1);
+            var1 = gDLL_31_flash->exports->load_game(bss_0, param1, sizeof(FlashStruct), 1);
+            var2 = gDLL_31_flash->exports->load_game(flashPtr, param1 + 4, sizeof(FlashStruct), 1);
 
             if (var1 == 0) {
                 if (var2 == 0) {
@@ -216,9 +217,9 @@ s32 gplay_func_3E4(s8 param1, u8 param2) {
         } else {
             queue_load_file_region_to_ptr(
                 bss_0,
-                0x3d,
-                param1 * 0x1800 - 0x6000,
-                0x1800);
+                SAVEGAME_BIN,
+                param1 * sizeof(FlashStruct) - 0x6000,
+                sizeof(FlashStruct));
             ret = 1;
         }
     } else {
@@ -245,16 +246,16 @@ void gplay_func_6AC() {
     if (bss_183C != -1) {
         bss_10.unk0.unk0.unk0.unk0x2f8 += 1;
 
-        bcopy(&bss_10, bss_0, 0x13d4);
+        bcopy(&bss_10.unk0.unk0.unk0, &bss_0->gplay.unk0.unk0, sizeof(GplayStruct8));
 
         gDLL_31_flash->exports->save_game(
             bss_0, 
             bss_183C + (bss_0->gplay.unk0.unk0.unk0x2f8 % 2) * 4, 
-            0x1800, 
+            sizeof(FlashStruct), 
             1);
 
         if (bss_4 != NULL) {
-            bcopy(&bss_10.unk0.unk0, &bss_4->unk0, 0x15d4);
+            bcopy(&bss_10.unk0.unk0, &bss_4->unk0, sizeof(GplayStruct9));
         }
     }
 }
@@ -266,10 +267,10 @@ u32 gplay_func_79C() {
     var = 1;
 
     ret = gDLL_31_flash->exports->load_game(
-        bss_8, 3, 0x80, 0);
+        bss_8, 3, sizeof(GplayStruct4), 0);
 
     if (ret == 0) {
-        bzero(bss_8, 0x80);
+        bzero(bss_8, sizeof(GplayStruct4));
         var = 0;
         bss_8->unk0x8 = 0x7f;
         bss_8->unk0x9 = 0x7f;
@@ -296,7 +297,7 @@ u32 gplay_func_79C() {
 
 void gplay_func_8D8() {
     gDLL_31_flash->exports->save_game(
-        bss_8, 3, 0x80, 0);
+        bss_8, 3, sizeof(GplayStruct4), 0);
 }
 
 GplayStruct4 *gplay_func_930() {
@@ -309,7 +310,7 @@ void gplay_func_94C(s32 param1) {
 
 void gplay_func_958(Vec3f *param1, s16 param2, s32 param3, s32 param4) {
     if ((param3 & 1) != 0) {
-        bcopy(&bss_10.unk0, bss_0, 0x15d4);
+        bcopy(&bss_10.unk0.unk0, &bss_0->gplay.unk0, sizeof(GplayStruct9));
     } else {
         if (func_8001EBE0() != 0) {
             bss_10.unk0.unk0x16F4[bss_10.unk0.unk0.unk0.character].unk0x10 |= 1;
@@ -320,31 +321,31 @@ void gplay_func_958(Vec3f *param1, s16 param2, s32 param3, s32 param4) {
         bss_10.unk0.unk0x16d4[bss_10.unk0.unk0.unk0.character].vec.x = param1->x;
         bss_10.unk0.unk0x16d4[bss_10.unk0.unk0.unk0.character].vec.y = param1->y;
         bss_10.unk0.unk0x16d4[bss_10.unk0.unk0.unk0.character].vec.z = param1->z;
-        bss_10.unk0.unk0x16d4[bss_10.unk0.unk0.unk0.character].unk0xC = (u8)(param2 >> 8);
+        bss_10.unk0.unk0x16d4[bss_10.unk0.unk0.unk0.character].unk0xC = param2 >> 8;
         bss_10.unk0.unk0x16d4[bss_10.unk0.unk0.unk0.character].unk0xD = param4;
 
-        bcopy(&bss_10, bss_0, 0x17ac);
+        bcopy(&bss_10.unk0, &bss_0->gplay, sizeof(GplayStruct3));
     }
 
     if (bss_4 != NULL) {
-        bcopy(&bss_10.unk0.unk0, &bss_4->unk0, 0x15d4);
+        bcopy(&bss_10.unk0.unk0, &bss_4->unk0, sizeof(GplayStruct9));
     }
 }
 
 void gplay_func_AE0() {
-    bcopy(bss_0, &bss_10, 0x17ac);
+    bcopy(&bss_0->gplay, &bss_10.unk0, sizeof(GplayStruct3));
     gplay_func_D94();
 }
 
 void gplay_func_B3C(Vec3f *param1, s16 param2, s32 param3) {
     if (bss_4 == NULL) {
-        bss_4 = (GplayStruct3*)malloc(0x17ac, 0xFFFF00FF, NULL);
+        bss_4 = (GplayStruct3*)malloc(sizeof(GplayStruct3), 0xFFFF00FF, NULL);
         if (bss_4 == NULL) {
             return;
         }
     }
 
-    bcopy(&bss_10.unk0, bss_4, 0x17ac);
+    bcopy(&bss_10.unk0, bss_4, sizeof(GplayStruct3));
 
     if (func_8001EBE0() != 0) {
         bss_4->unk0x16F4[bss_4->unk0.unk0.character].unk0x10 |= 1;
@@ -361,7 +362,7 @@ void gplay_func_B3C(Vec3f *param1, s16 param2, s32 param3) {
 
 void gplay_func_CBC() {
     if (bss_4 != NULL) {
-        bcopy(bss_4, &bss_10, 0x17ac);
+        bcopy(bss_4, &bss_10.unk0, sizeof(GplayStruct3));
         gplay_func_D94();
     }
 }
@@ -526,8 +527,8 @@ u32 gplay_func_1270() {
 
 static void gplay_func_1314() {
     bss_183C = -1;
-    bzero(&bss_10, 0x182c);
-    bzero(bss_0, 0x1800);
+    bzero(&bss_10, sizeof(GplayStruct7));
+    bzero(bss_0, sizeof(FlashStruct));
 }
 
 void gplay_func_1378(s32 param1, s32 param2) {

src/dlls/engine/29_gplay/gplay.c

@@ -0,0 +1,16 @@
+.option pic2
+.section ".exports"
+.global _exports
+_exports:
+
+# ctor/dtor
+.dword task_ctor
+.dword task_dtor
+
+# export table
+.dword task_load_recently_completed
+.dword task_mark_task_completed
+.dword task_get_num_recently_completed
+.dword task_func_390
+.dword task_func_3F8
+.dword task_get_completion_percentage

src/dlls/engine/30_tasktext/dll.yaml src/dlls/engine/30_task/dll.yaml

@@ -0,0 +1,9 @@
+# functions
+task_ctor = 0x0;
+task_dtor = 0xC;
+task_load_recently_completed = 0x18;
+task_mark_task_completed = 0xDC;
+task_get_num_recently_completed = 0x368;
+task_func_390 = 0x390;
+task_func_3F8 = 0x3F8;
+task_get_completion_percentage = 0x454;