mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-05-23 06:34:18 -04:00
Link Famicom/famicom.cpp
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
#define MURA_GAME_NAME_SIZE 16
|
||||
|
||||
static void* my_malloc(size_t size, u32 align) { return (*my_malloc_current->malloc_align)(size, align); }
|
||||
static void* my_malloc(size_t size, int align) { return (*my_malloc_current->malloc_align)(size, align); }
|
||||
static void my_free(void* ptr) { (*my_malloc_current->free)(ptr); }
|
||||
static int my_getmemblocksize(void* ptr) { return (*my_malloc_current->getmemblocksize)(ptr); }
|
||||
static int my_gettotalfreesize() { return (*my_malloc_current->gettotalfreesize)(); }
|
||||
|
||||
@@ -26,8 +26,7 @@ struct J2DGrafBlend {
|
||||
struct J2DGrafContext {
|
||||
J2DGrafContext(f32, f32, f32, f32);
|
||||
|
||||
virtual ~J2DGrafContext() {
|
||||
} // _08 (weak)
|
||||
virtual ~J2DGrafContext() {} // _08 (weak)
|
||||
virtual void place(const JGeometry::TBox2f&); // _0C
|
||||
virtual void place(f32 x, f32 y, f32 width, f32 height) {
|
||||
JGeometry::TBox2f box(x, y, x + width, y + height);
|
||||
|
||||
@@ -100,11 +100,12 @@ class JUTGamePad : public JKRDisposer {
|
||||
}
|
||||
|
||||
/* @HACK - This gets inlined when defined -- JSystem might have precompiled headers */
|
||||
static s8 getPortStatus(EPadPort port);
|
||||
/*{
|
||||
|
||||
static s8 getPortStatus(EPadPort port)
|
||||
{
|
||||
JUT_ASSERT(0 <= port && port < 4);
|
||||
return mPadStatus[port].err;
|
||||
}*/
|
||||
}
|
||||
|
||||
bool isPushing3ButtonReset() const {
|
||||
bool pushing = false;
|
||||
|
||||
Reference in New Issue
Block a user