From 137e393b3ac1e710a03e672ffcf0457fdbbe3284 Mon Sep 17 00:00:00 2001
From: andreadellacorte <andrea@dellacorte.me>
Date: Sat, 23 May 2026 12:03:25 +0300
Subject: [PATCH 1/2] libcd: match CdStatus, CdMode, CdLastCom

---
 src/SLUS_010.40/libcd/SYS.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/SLUS_010.40/libcd/SYS.c b/src/SLUS_010.40/libcd/SYS.c
index 12e99562..5ea686d2 100644
--- a/src/SLUS_010.40/libcd/SYS.c
+++ b/src/SLUS_010.40/libcd/SYS.c
@@ -1,10 +1,20 @@
 #include "common.h"
 
-INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdStatus);
+typedef void (*CdlCB)(unsigned char, unsigned char*);
 
-INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdMode);
+extern unsigned char D_80032208;
+extern unsigned char D_80032214[];
+extern unsigned char D_80032218;
+extern unsigned char D_80032219;
+extern int D_80032204;
+extern CdlCB D_800321FC;
+extern CdlCB D_80032200;
 
-INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdLastCom);
+int CdStatus(void) { return D_80032208; }
+
+int CdMode(void) { return D_80032218; }
+
+int CdLastCom(void) { return D_80032219; }
 
 INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdLastPos);
 

From a9b545d108d414054806a509823143c363b77cec Mon Sep 17 00:00:00 2001
From: andreadellacorte <andrea@dellacorte.me>
Date: Sat, 23 May 2026 23:59:47 +0300
Subject: [PATCH 2/2] Makefile: pass --no-print-directory explicitly to
 sub-makes

GNU Make 4.4+ parses long flags in target-specific MAKEFLAGS as targets
when invoked via $(MAKE), breaking commit-check. Passing the flag
directly to each $(MAKE) invocation works on all make versions.
---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b7aa0d9d..18cbe739 100644
--- a/Makefile
+++ b/Makefile
@@ -46,16 +46,14 @@ all: check
 check: $$(TARGETS)
 
 commit-check: format
-	$(MAKE) remake
-	$(MAKE) objdiff
+	$(MAKE) --no-print-directory remake
+	$(MAKE) --no-print-directory objdiff
 
 clean:
 	$(RM) $(RMFLAGS) $(BUILD) nonmatchings
 
 remake: clean
-	$(MAKE)
-
-commit-check remake: MAKEFLAGS += --no-print-directory
+	$(MAKE) --no-print-directory
 
 include $(INCMAKEFILES)