Match 10.15% of lb_0192 (1.62 KB) (#1207)

Co-authored-by: Ryan Burns <[email protected]>
doldecomp · Feb 12, 2024 · 16d289b · 16d289b
1 parent 15a5829
commit 16d289b
Show file tree

Hide file tree

Showing 14 changed files with 2,239 additions and 2,073 deletions.
diff --git a/asm/melee/lb/lb_0192.s b/asm/melee/lb/lb_0192.s
diff --git a/asm/melee/lb/lb_0198.s → asm/melee/lb/lbcardgame.s b/asm/melee/lb/lb_0198.s → asm/melee/lb/lbcardgame.s
diff --git a/asm/melee/lb/lbdvd.s b/asm/melee/lb/lbdvd.s
@@ -2280,13 +2280,23 @@
 .endobj gap_09_804D37E2_sdata
 
 .obj lbDvd_804D37E4, global
-	.string "ItCo.\000\000"
+	.string "ItCo."
 .endobj lbDvd_804D37E4
 
+.obj gap_09_804D37EA_sdata, global
+.hidden gap_09_804D37EA_sdata
+	.2byte 0x0000
+.endobj gap_09_804D37EA_sdata
+
 .obj lbDvd_804D37EC, global
-	.string "IfAll\000\000"
+	.string "IfAll"
 .endobj lbDvd_804D37EC
 
+.obj gap_09_804D37F2_sdata, global
+.hidden gap_09_804D37F2_sdata
+	.2byte 0x0000
+.endobj gap_09_804D37F2_sdata
+
 .obj lbDvd_804D37F4, global
 	.4byte 0x00000004
 	.4byte 0x00000005

diff --git a/config/GALE01/scratches.txt b/config/GALE01/scratches.txt
@@ -121,8 +121,8 @@ func_80017EBC = OK:0x80017EBC; // author:Tri-Wing id:iMpDJ updated:2022-12-11T07
 func_8001819C = OK:0x8001819C; // author:r-burns id:IPZrJ updated:2022-11-14T02:31:48.623285Z created:2022-11-13T21:48:40.584225Z
 func_8001819C = OK:0x8001819C; // author:Tri-Wing id:m2u2W updated:2022-12-10T04:15:20.04807Z created:2022-12-10T03:53:44.173533Z
 func_80018C6C = OK:0x80018C6C; // author:Tri-Wing id:tpD7w updated:2022-12-12T18:03:33.943857Z created:2022-12-12T17:29:05.787415Z
-func_80019230 = 100%:0x80019230; // author:r-burns id:EdQpi updated:2022-11-14T05:02:42.584324Z created:2022-11-14T04:50:20.939423Z
-func_800195D0 = 100%:0x800195D0; // id:TuBUN updated:2022-12-10T00:04:16.495374Z created:2022-12-10T00:01:23.097511Z
+func_80019230 = OK:0x80019230; // author:r-burns id:EdQpi updated:2022-11-14T05:02:42.584324Z created:2022-11-14T04:50:20.939423Z
+func_800195D0 = OK:0x800195D0; // id:TuBUN updated:2022-12-10T00:04:16.495374Z created:2022-12-10T00:01:23.097511Z
 Untitled = 100%:0x8001D2BC; // id:ZwG56 parent:4UHq0 updated:2023-01-12T19:08:42.845254Z created:2023-01-12T18:31:06.374911Z
 lbGx_8001E2F8 = OK:0x8001E2F8; // author:PsiLupan id:6KC9g updated:2024-02-06T08:50:15.637343Z created:2024-02-06T08:41:15.643412Z
 func_8001E6D8 = 100%:0x8001E6D8; // author:r-burns id:gryjC parent:FEOFs updated:2022-09-15T23:37:42.204971Z created:2022-09-15T23:37:41.24588Z

diff --git a/config/GALE01/splits.txt b/config/GALE01/splits.txt
@@ -97,11 +97,11 @@ melee/lb/lbdvd.c:
 
 melee/lb/lb_0192.c:
 	.text       start:0x80019230 end:0x80019880
-	.data       start:0x803BA708 end:0x803BAAA8
+	.data       start:0x803BA708 end:0x803BAAE0
 
-melee/lb/lb_0198.c:
+melee/lb/lbcardgame.c:
 	.text       start:0x80019880 end:0x8001D2BC
-	.data       start:0x803BAAA8 end:0x803BACC8
+	.data       start:0x803BAAE0 end:0x803BACC8
 	.bss        start:0x804329F0 end:0x804333E0
 	.sdata      start:0x804D3800 end:0x804D3828
 	.sbss       start:0x804D63D0 end:0x804D63D8

diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -386,7 +386,7 @@ lbDvd_80018F68 = .text:0x80018F68; // type:function size:0x198 scope:global
 lbDvd_80019100 = .text:0x80019100; // type:function size:0x130 scope:global
 lb_80019230 = .text:0x80019230; // type:function size:0x78 scope:global
 lb_800192A8 = .text:0x800192A8; // type:function size:0x2B4 scope:global
-fn_8001955C = .text:0x8001955C; // type:function size:0x74
+lb_8001955C = .text:0x8001955C; // type:function size:0x74
 lb_800195D0 = .text:0x800195D0; // type:function size:0x2C scope:global
 fn_800195FC = .text:0x800195FC; // type:function size:0x2C
 lb_80019628 = .text:0x80019628; // type:function size:0x258 scope:global
@@ -20558,13 +20558,19 @@ jumptable_803BAAA8 = .data:0x803BAAA8; // type:object size:0x34 scope:local
 lb_803BAAE0 = .data:0x803BAAE0; // type:object size:0xC scope:global data:string
 lb_803BAAEC = .data:0x803BAAEC; // type:object size:0x1C scope:global data:string
 jumptable_803BAB08 = .data:0x803BAB08; // type:object size:0x38 scope:local
-lb_803BAB40 = .data:0x803BAB40; // type:object size:0x10 scope:global
-lb_803BAB50 = .data:0x803BAB50; // type:object size:0x10 scope:global
+lb_803BAB40 = .data:0x803BAB40; // type:object size:0xE scope:local data:string
+lb_803BAB50 = .data:0x803BAB50; // type:object size:0xD scope:local data:string
 lb_803BAB60 = .data:0x803BAB60; // type:object size:0x14 scope:global
-lb_803BAB74 = .data:0x803BAB74; // type:object size:0xE8 scope:global
-lb_803BAC5C = .data:0x803BAC5C; // type:object size:0x1C scope:global
-lb_803BAC78 = .data:0x803BAC78; // type:object size:0x10 scope:global
-lb_803BAC88 = .data:0x803BAC88; // type:object size:0x40 scope:global
+lb_803BAB74 = .data:0x803BAB74; // type:object size:0x28 scope:global
+lb_803BAB9C = .data:0x803BAB9C; // type:object size:0x80 scope:local data:4byte
+str0 = .data:0x803BAC1C; // type:object size:0x2A scope:local data:string
+str1 = .data:0x803BAC48; // type:object size:0x11 scope:local data:string
+lb_803BAC5C = .data:0x803BAC5C; // type:object size:0x19 scope:local data:string
+lb_803BAC78 = .data:0x803BAC78; // type:object size:0xD scope:local data:string
+lb_803BAC88 = .data:0x803BAC88; // type:object size:0xB scope:local data:string
+str2 = .data:0x803BAC94; // type:object size:0xA scope:local data:string
+str3 = .data:0x803BACA0; // type:object size:0x10 scope:local data:string
+str4 = .data:0x803BACB0; // type:object size:0x17 scope:local data:string
 lbSnap_803BACC8 = .data:0x803BACC8; // type:object size:0x2C scope:global
 lbSnap_803BACF4 = .data:0x803BACF4; // type:object size:0xC scope:global
 lbSnap_803BAD00 = .data:0x803BAD00; // type:object size:0x90 scope:global
@@ -25281,8 +25287,8 @@ lbArchive_804D37C4 = .sdata:0x804D37C4; // type:object size:0xC scope:global
 lbDvd_804D37D0 = .sdata:0x804D37D0; // type:object size:0x8 scope:local data:string
 lbDvd_804D37D8 = .sdata:0x804D37D8; // type:object size:0x8 scope:local data:string
 lbDvd_804D37E0 = .sdata:0x804D37E0; // type:object size:0x2 scope:local data:string
-lbDvd_804D37E4 = .sdata:0x804D37E4; // type:object size:0x8 scope:global data:string
-lbDvd_804D37EC = .sdata:0x804D37EC; // type:object size:0x8 scope:global data:string
+lbDvd_804D37E4 = .sdata:0x804D37E4; // type:object size:0x6 scope:global data:string
+lbDvd_804D37EC = .sdata:0x804D37EC; // type:object size:0x6 scope:global data:string
 lbDvd_804D37F4 = .sdata:0x804D37F4; // type:object size:0xC scope:global data:4byte
 lb_804D3800 = .sdata:0x804D3800; // type:object size:0x4 scope:global
 lb_804D3804 = .sdata:0x804D3804; // type:object size:0x4 scope:global

diff --git a/configure.py b/configure.py
@@ -331,7 +331,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/lb/lbarchive.c"),
             Object(NonMatching, "melee/lb/lbdvd.c"),
             Object(NonMatching, "melee/lb/lb_0192.c"),
-            Object(NonMatching, "melee/lb/lb_0198.c"),
+            Object(NonMatching, "melee/lb/lbcardgame.c"),
             Object(NonMatching, "melee/lb/lbsnap.c"),
             Object(Matching, "melee/lb/lbgx.c"),
             Object(NonMatching, "melee/lb/lbanim.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -29,7 +29,7 @@ TEXT_O_FILES :=\
     $(BUILD_DIR)/asm/melee/lb/lbarchive.s.o\
     $(BUILD_DIR)/asm/melee/lb/lbdvd.s.o\
     $(BUILD_DIR)/asm/melee/lb/lb_0192.s.o\
-    $(BUILD_DIR)/asm/melee/lb/lb_0198.s.o\
+    $(BUILD_DIR)/asm/melee/lb/lbcardgame.s.o\
     $(BUILD_DIR)/asm/melee/lb/lbsnap.s.o\
     $(BUILD_DIR)/src/melee/lb/lbgx.c.o\
     $(BUILD_DIR)/asm/melee/lb/lbanim.s.o\

diff --git a/src/melee/gm/gmmain.c b/src/melee/gm/gmmain.c
@@ -7,7 +7,7 @@
 #include "db/db_2253.h"
 #include "gm/gm_1601.h"
 #include "gm/gmmain_lib.h"
-#include "lb/lb_0198.h"
+#include "lb/lbcardgame.h"
 #include "lb/lbarq.h"
 #include "lb/lbaudio_ax.h"
 #include "lb/lbdvd.h"

diff --git a/src/melee/lb/lb_0192.c b/src/melee/lb/lb_0192.c
@@ -0,0 +1,33 @@
+#include "lb_0192.h"
+
+#include "lbcardgame.h"
+
+#include <dolphin/dvd/dvd.h>
+
+/* 019230 */ static enum_t lb_80019230(void);
+
+enum_t lb_80019230(void)
+{
+    switch (DVDGetDriveStatus()) {
+    case 5:
+        return 0;
+    case 4:
+        return 1;
+    case 6:
+        return 2;
+    case 11:
+        return 3;
+    case -1:
+        return 4;
+    case 1:
+        return 5;
+    default:
+        return -1;
+    }
+}
+
+void lb_800195D0(void)
+{
+    lb_800192A8(lb_8001955C);
+    lb_8001CC84();
+}
diff --git a/src/melee/lb/lb_0192.h b/src/melee/lb/lb_0192.h
@@ -1,8 +1,12 @@
-#ifndef MELEE_LB_LBUNKNOWN_004_H
-#define MELEE_LB_LBUNKNOWN_004_H
+#ifndef GALE01_019230
+#define GALE01_019230
 
 #include <platform.h>
 
-void lb_800195D0(void);
+#include <placeholder.h>
+
+/* 0192A8 */ void lb_800192A8(UNK_T cb);
+/* 01955C */ UNK_RET lb_8001955C(UNK_PARAMS);
+/* 0195D0 */ void lb_800195D0(void);
 
 #endif
diff --git a/src/melee/lb/lb_0198.h b/src/melee/lb/lb_0198.h
diff --git a/src/melee/lb/lb_0198.c → src/melee/lb/lbcardgame.c b/src/melee/lb/lb_0198.c → src/melee/lb/lbcardgame.c
diff --git a/src/melee/lb/lbcardgame.h b/src/melee/lb/lbcardgame.h
@@ -0,0 +1,11 @@
+#ifndef GALE01_019880
+#define GALE01_019880
+
+#include <platform.h>
+
+/* 019AAC */ void lb_80019AAC(Event);
+/* 01C5BC */ void lb_8001C5BC(void);
+/* 01CC84 */ void lb_8001CC84(void);
+/* 01D21C */ void lb_8001D21C(void);
+
+#endif