link famicom_emu

include/Famicom/famicom.h

@@ -70,11 +70,17 @@ typedef struct famicom_common_s {
 
 
 extern void* my_malloc_current;
+extern u8 save_game_image;
 
 typedef u8 (*FAMICOM_GETSAVECHAN_PROC)(int* player_no, int* slot_card_result);
 extern void famicom_setCallback_getSaveChan(FAMICOM_GETSAVECHAN_PROC getSaveChan_proc);
 extern int famicom_mount_archive();
 extern int famicom_mount_archive_end_check();
+extern int famicom_rom_load_check();
+extern int famicom_1frame();
+extern int famicom_init(int, void*, u8);
+extern int famicom_cleanup();
+
 
 #ifdef __cplusplus
 }

include/audio.h

@@ -73,7 +73,7 @@ extern void sAdo_BgmCrossfadeStart(u8 b);
 
 extern void sAdo_SubGameStart();
 extern void sAdo_SubGameEnd();
-extern u8 sAdo_SubGameOK();
+extern int sAdo_SubGameOK();
 
 extern void sAdo_Tenki(u8 mode);
 

include/famicom_emu.h

@@ -15,8 +15,16 @@ typedef struct game_famicom_emu_s {
 
 extern void* my_malloc_func[];
 
-extern void famicom_emu_init(GAME_FAMICOM_EMU* famicom_emu);
-extern void famicom_emu_cleanup(GAME_FAMICOM_EMU* famicom_emu);
+void my_alloc_cleanup();
+void my_zelda_getmemblocksize(void *);
+void my_zelda_gettotalfreesize();
+void* my_zelda_malloc_align(size_t, u32);
+void my_zelda_free(void *);
+void famicom_emu_main(GAME *);
+void famicom_emu_init(GAME_FAMICOM_EMU *);
+void famicom_emu_cleanup(GAME *);
+int famicom_gba_getImage(u32, int *);
+void famicom_gba_removeImage(void *);
 
 #ifdef __cplusplus
 }

include/jaudio_NES/game64.h

@@ -36,7 +36,7 @@ extern void Na_MDPlayerPos(u16,u16,u16,int, f32);
 extern void Na_BGMVolume(f32,u16);
 extern void Na_SubGameStart();
 extern void Na_SubGameEnd();
-extern int Na_SubGameOK();
+extern u8 Na_SubGameOK();
 extern void Na_Tenki(u8);
 extern void Na_KishaStatusTrg(u8);
 extern void Na_KishaStatusLevel(f32 speed, u32 ongenNum1, u16 angle1, f32 distance1, u32 ongenNum2, u16 angle2, f32 distance2);

include/jsyswrap.h

@@ -2,12 +2,25 @@
 #define JSYSWRAP_H
 
 #include "types.h"
+#include "dolphin/gx.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 extern void JW_JUTReport(int pos_x, int pos_y, int show_count, const char* fmt, ...);
+extern void JC_JFWDisplay_startFadeOut(void*, int);
+extern void* JC_JFWDisplay_getManager();
+extern void JC_JFWDisplay_clearEfb(void*, GXColor*);
+extern GXRenderModeObj* JC_JFWDisplay_getRenderMode(void*);
+extern void* JC_JFWDisplay_changeToSingleXfb(void*, int);
+
+extern void JC_JFWDisplay_startFadeIn(void*, int);
+extern void JC_JFWDisplay_changeToDoubleXfb(void*);
+extern u32 JC__JKRGetResource(char*);
+extern int JC__JKRGetMemBlockSize(int, u32);
+
+extern void JC__JKRRemoveResource(void*);
 
 #ifdef __cplusplus
 }

include/libc64/sprintf.h

@@ -0,0 +1,6 @@
+#ifndef SPRINTF_H
+#define SPRINTF_H
+
+s32 sprintf(char* dst, const char* fmt, ...);
+
+#endif

include/m_common_data.h

@@ -202,7 +202,10 @@ typedef struct common_data_s {
   /* 0x0285C0 */ s8 player_decoy_flag;
   /* 0x0285C1 */ u8 _285C1[0x0285C6 - 0x0285C1];
   /* 0x0285C6 */ u8 event_id;
-  /* 0x0285C7 */ u8 _285C3[0x028838 - 0x0285C7];
+  /* 0x0285C7 */ u8 _285C3[0x0287F8 - 0x0285C7];
+  /* 0x0287F8 */ s8 current_famicom_rom;
+  /* 0x0287F9 */ s8 famicom_287F9;
+  /* 0x0287FA */ u8 _287FA[0x28838 - 0x0287FA]; 
   /* 0x028838 */ s8 player_bee_swell_flag;
   /* 0x028839 */ s8 player_bee_chase_flag;
   /* 0x02883A */ u8 goki_shocked_flag;
@@ -249,7 +252,8 @@ typedef struct common_data_s {
   /* 0x02DB40 */ u8 auto_nwrite_set; /* when true, saved nwrite time will be utilized. Seems to be used to keep same date for fishing tourney stuff. */
   /* 0x02DB42 */ u16 select_last_select_no;
   /* 0x02DB44 */ u16 select_last_top_no;
-  /* 0x02DB46 */ u8 tmp3[0x2DBB0 - 0x2DB46];
+  /* 0x02DB46 */ u8 tmp3[0x2DBAC - 0x2DB46];
+  /* 0X02DBAC */ int famicom_2DBAC;
   /* 0x02DBB0 */ s16 can_look_goki_count;
   /* 0x02DBB4 */ f32 rainbow_opacity; /* current opacity of rainbow (0.0f - 1.0f) */
   /* 0x02DBB8 */ u32 event_flags[7]; /* TODO: make array size a definition/enum */

include/m_scene.h

@@ -3,6 +3,7 @@
 
 #include "types.h"
 #include "m_lib.h"
+#include "famicom_emu.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -103,6 +104,8 @@ extern void mSc_data_bank_ct(GAME_PLAY*, Object_Exchange_c*);
 extern void Door_info_ct(Door_data_c**);
 extern void Scene_ct(GAME_PLAY*, void*);
 extern void mSc_decide_exchange_bank(Object_Exchange_c*);
+extern void return_emu_game(GAME*);
+
 
 #ifdef __cplusplus
 }