Merge branch 'master' into m_all_grow_ovl

include/ac_t_pistol.h

@@ -3,11 +3,27 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "libultra/ultratypes.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef void (*PISTOL_PROC)(ACTOR*);
+
+typedef struct t_pistol_s{
+    ACTOR actor_class;
+    int unk174;
+    MtxF matrix_work;
+    int enable;
+    int unk1BC;
+    int process_id;
+    u8 pad2[0x8];
+    PISTOL_PROC proc; 
+    int current_id;
+}PISTOL_ACTOR;
+
+
 extern ACTOR_PROFILE T_Pistol_Profile;
 
 #ifdef __cplusplus

include/executor.h

@@ -0,0 +1,10 @@
+#ifndef EXECUTOR_H
+#define EXECUTOR_H
+
+#include "types.h"
+
+void _prolog();
+void _epilog();
+void _unresolved();
+
+#endif

include/m_actor.h

@@ -33,8 +33,10 @@ typedef void (*mActor_proc)(ACTOR*, GAME*);
 #define ACTOR_OBJ_BANK_NONE 0
 #define ACTOR_OBJ_BANK_3 3 /* TODO: rename, also likely an enum */
 #define ACTOR_OBJ_BANK_7 7
+#define ACTOR_OBJ_BANK_10 10
 #define ACTOR_OBJ_BANK_11 11
 #define ACTOR_OBJ_BANK_12 12
+#define ACTOR_OBJ_BANK_16 16
 #define ACTOR_OBJ_BANK_41 41
 
 enum actor_part {

include/m_common_data.h

@@ -190,7 +190,8 @@ typedef struct common_data_s {
   /* 0x0266A4 */ int scene_from_title_demo; /* next scene to be loaded when title demo finishes */
   /* 0x0266A8 */ mNPS_schedule_c npc_schedule[SCHEDULE_NUM];
   /* 0x0267A8 */ mNpc_walk_c npc_walk;
-  /* 0x026838 */ u8 _26838[0x2852C - 0x26838];
+  /* 0x026838 */ u8 _26838[0x28528 - 0x26838];
+  /* 0x028528 */ int snowman_msg_id;
   /* 0x02852C */ s16 money_power;
   /* 0x02852E */ s16 goods_power;
   /* 0x028530 */ Door_data_c door_data; /* misc door data */

include/m_name_table.h

@@ -182,6 +182,7 @@ extern mActor_name_t bg_item_fg_sub_tree_grow(mActor_name_t tree, int past_days,
 #define MUSIC_BOARD0 0x000E
 #define MUSIC_BOARD1 0x000F
 
+
 #define BURIED_PITFALL0 0x002A
 
 #define SHINE_SPOT 0x005C
@@ -1189,6 +1190,15 @@ extern mActor_name_t bg_item_fg_sub_tree_grow(mActor_name_t tree, int past_days,
 #define ACTOR_PROP_HANIWA1 (ACTOR_PROP_HANIWA0 + 1)
 #define ACTOR_PROP_HANIWA2 (ACTOR_PROP_HANIWA1 + 1)
 #define ACTOR_PROP_HANIWA3 (ACTOR_PROP_HANIWA2 + 1)
+#define SNOWMAN0 (ACTOR_PROP_HANIWA3 + 1)
+#define SNOWMAN1 (SNOWMAN0 + 1)
+#define SNOWMAN2 (SNOWMAN1 + 1)
+#define SNOWMAN3 (SNOWMAN2 + 1)
+#define SNOWMAN4 (SNOWMAN3 + 1)
+#define SNOWMAN5 (SNOWMAN4 + 1)
+#define SNOWMAN6 (SNOWMAN5 + 1)
+#define SNOWMAN7 (SNOWMAN6 + 1)
+#define SNOWMAN8 (SNOWMAN7 + 1)
 #define TRAIN_DOOR 0xA011
 
 #define SP_NPC_START 0xD000

include/m_snowman.h

@@ -2,6 +2,8 @@
 #define M_SNOWMAN_H
 
 #include "types.h"
+#include "m_lib.h"
+#include "m_actor_type.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,8 +24,20 @@ typedef struct snowman_save_data_s {
   /* 0x00 */ mSN_snowman_data_c snowmen_data[mSN_SAVE_COUNT];
 } mSN_snowman_save_c;
 
-extern int mSN_MeltSnowman(mActor_name_t* item, int past_days);
-extern int mSN_ClearSnowman(mActor_name_t* item);
+/* sizeof(mSN_snowman_info_c) == 0xC */
+typedef struct snowman_info_s{
+  /* 0x00 */ int scale;
+  /* 0x04 */ xyz_t pos;
+}mSN_snowman_info_c;
+
+extern int mSN_check_life(mActor_name_t* ac, int idx);
+extern int mSN_ClearSnowmanData(mActor_name_t* ac, int idx);
+extern int mSN_ClearSnowman(mActor_name_t* ac);
+extern int mSN_MeltSnowman(mActor_name_t* ac, int days);
+extern int mSN_get_free_space();
+extern void mSN_regist_snowman_society(mSN_snowman_info_c* info);
+extern void mSN_decide_msg();
+extern void mSN_snowman_init();
 
 #ifdef __cplusplus
 }

include/main.h

@@ -20,6 +20,8 @@ extern int ScreenHeight;
 extern OSThread graphThread;
 extern u8 SegmentBaseAddress[0x40];
 
+void foresta_main();
+
 #ifdef __cplusplus
 }
 #endif