Skip to content

Decomp libcd: CdStatus, CdMode, CdLastCom (+ Makefile commit-check fix) #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreadellacorte wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Decomp libcd: CdStatus, CdMode, CdLastCom (+ Makefile commit-check fix) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
137e393
libcd: match CdStatus, CdMode, CdLastCom
andreadellacorte May 23, 2026
a9b545d
Makefile: pass --no-print-directory explicitly to sub-makes
andreadellacorte May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@ser-pounce ser-pounce May 24, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suspicious change, are you sure it was breaking the build as per the commit comment? I compiled 4.4.1 from source to verify but it works fine on Ubuntu.

$(MAKE) --no-print-directory

include $(INCMAKEFILES)

Expand Down
16 changes: 13 additions & 3 deletions src/SLUS_010.40/libcd/SYS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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*);

@ser-pounce ser-pounce May 24, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already defined in <libcd.h> so it should be enough to add an #include at the top.


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);

Expand Down
Loading