Match the rest of mcardGCN.c (#179)

* Match mcard read/write functions * Match mcard read/write asynch functions * Match a few more * Match remaining mcard functions * Match data * Fix merge
zeldaret · Sep 19, 2024 · a095e73 · a095e73
1 parent 8d833dc
commit a095e73
Show file tree

Hide file tree

Showing 4 changed files with 1,809 additions and 156 deletions.
diff --git a/configure.py b/configure.py
@@ -251,7 +251,7 @@ def LinkedFor(*versions):
             Object(Linked, "emulator/THPDraw.c", cflags=cflags_base),
             Object(Linked, "emulator/THPRead.c"),
             Object(Linked, "emulator/THPVideoDecode.c", cflags=cflags_base),
-            Object(LinkedFor("ce-j"), "emulator/mcardGCN.c", asm_processor=True),
+            Object(LinkedFor("ce-j"), "emulator/mcardGCN.c"),
             Object(Linked, "emulator/codeGCN.c"),
             Object(Linked, "emulator/soundGCN.c"),
             Object(LinkedFor("ce-j"), "emulator/frame.c", asm_processor=True),

diff --git a/include/emulator/simGCN.h b/include/emulator/simGCN.h
@@ -71,6 +71,7 @@ typedef enum SimulatorArgumentType {
 
 extern bool gDVDResetToggle;
 extern bool gbDisplayedError;
+extern bool gButtonDownToggle;
 
 extern void* gpFrame;
 extern void* gpSound;
@@ -164,6 +165,7 @@ bool simulatorDetectController(s32 channel);
 bool simulatorReadPak(s32 channel, u16 address, u8* data);
 bool simulatorWritePak(s32 channel, u16 address, u8* data);
 bool simulatorSetControllerMap(u32* mapData, s32 channel);
+void simulatorReset(bool IPL, bool forceMenu);
 void simulatorResetAndPlayMovie(void);
 bool simulatorDrawErrorMessage(SimulatorMessage simulatorErrorMessage, bool drawBar, s32 percent);
 bool simulatorDVDShowError(s32 nStatus, void*, s32, u32);