Merge branch 'master' into ac_t_utiwa

include/Famicom/famicom.h

@@ -8,13 +8,18 @@
 extern "C" {
 #endif
 
+#define FAMICOM_INTERNAL_ROM_NUM 19
+
+#define NESTAG_CMD_SIZE 3
+#define NESTAG_SIZE (NESTAG_CMD_SIZE + 1)
+
 #define NESTAG_END "END"
 #define NESTAG_VEQ "VEQ"
 #define NESTAG_VNE "VNE"
 #define NESTAG_GID "GID"
 #define NESTAG_GNM "GNM"
 #define NESTAG_CPN "CPN"
-#define NESTAG_OFS "OFS"
+#define NESTAG_OFS "OFS"  /* Offset into the shared highscore data to read/write at */
 #define NESTAG_HSC "HSC"
 #define NESTAG_GNO "GNO"
 #define NESTAG_BBR "BBR"
@@ -100,6 +105,8 @@ typedef struct famicom_common_s {
 extern void* my_malloc_current;
 extern u8 save_game_image;
 
+extern FamicomCommon famicomCommon;
+
 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();
@@ -109,6 +116,8 @@ extern int famicom_1frame();
 extern int famicom_init(int, void*, u8);
 extern int famicom_cleanup();
 
+extern void nesinfo_tags_set(int rom_no);
+
 
 #ifdef __cplusplus
 }

include/Famicom/ks_nes_common.h

@@ -27,7 +27,8 @@ typedef struct ks_nes_common_work_obj_s {
 } ksNesCommonWorkObj;
 
 typedef struct ks_nes_state_obj_s {
-  u8 _temp[0x1A78];
+  /* 0x0000 */ u8 wram[2048];
+  /* 0x0800 */ u8 _temp[0x1A78 - 0x800];
 } ksNesStateObj;
 
 #ifdef __cplusplus

include/_mem.h

@@ -11,6 +11,7 @@ extern "C" {
 
 void * memcpy(void * dst, const void * src, size_t n);
 void * memset(void * dst, int val, size_t n);
+int memcmp(const void* src1, const void* src2, size_t n);
 void __fill_mem(void * dst, int val, unsigned long n);
 
 #pragma section code_type

include/ac_ev_kabuPeddler.h

@@ -3,11 +3,27 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "ac_npc.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define aEKPD_KABU_TYPE_NUM 4
+
+typedef struct ev_kabuPeddler_s EV_KABUPEDDLER_ACTOR;
+
+typedef void (*aEKPD_PROC)(EV_KABUPEDDLER_ACTOR*, GAME_PLAY*);
+typedef void (*aEKPD_SETUP_PROC)(EV_KABUPEDDLER_ACTOR*, GAME_PLAY*, int);
+
+struct ev_kabuPeddler_s {
+    NPC_ACTOR npc_class;
+    int kabu_type;
+    int talk_act;
+    aEKPD_PROC talk_proc;
+    aEKPD_SETUP_PROC setup_talk_proc;
+};
+
 extern ACTOR_PROFILE Ev_KabuPeddler_Profile;
 
 #ifdef __cplusplus

include/ac_t_zinnia1.h

@@ -3,6 +3,7 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "ac_tools.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,6 +11,15 @@ extern "C" {
 
 extern ACTOR_PROFILE T_Zinnia1_Profile;
 
+typedef void (*ZINNIA1_PROC)(ACTOR*);
+
+typedef struct t_zinnia1_s {
+    TOOLS_ACTOR tools_class;
+    ZINNIA1_PROC proc; 
+    int current_id;
+    
+} ZINNIA1_ACTOR;
+
 #ifdef __cplusplus
 }
 #endif

include/ac_t_zinnia2.h

@@ -3,6 +3,7 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "ac_tools.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,6 +11,15 @@ extern "C" {
 
 extern ACTOR_PROFILE T_Zinnia2_Profile;
 
+typedef void (*ZINNIA2_PROC)(ACTOR*);
+
+typedef struct t_zinnia2_s {
+    TOOLS_ACTOR tools_class;
+    ZINNIA2_PROC proc; 
+    int current_id;
+    
+} ZINNIA2_ACTOR;
+
 #ifdef __cplusplus
 }
 #endif