mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-07-09 12:37:22 -04:00
Merge pull request #74 from Cuyler36/m_private
Implement & link m_private.c
This commit is contained in:
Cuyler36
@@ -79,6 +79,11 @@ m_police_box.c:
|
||||
.text: [0x803DE8A0, 0x803DEE38]
|
||||
.rodata: [0x806431C8, 0x806431D8]
|
||||
.data: [0x8065BE98, 0x8065BEF0]
|
||||
m_private.c:
|
||||
.text: [0x803DFF7C, 0x803E2990]
|
||||
.rodata: [0x806431D8, 0x80643208]
|
||||
.data: [0x8065BF00, 0x8065C030]
|
||||
.bss: [0x8129CD40, 0x8129F2B0]
|
||||
m_random_field.c:
|
||||
.text: [0x803E4B20, 0x803E50E4]
|
||||
.rodata: [0x80643218, 0x80643240]
|
||||
|
||||
@@ -95,7 +95,7 @@ typedef struct Save_s {
|
||||
/* 0x020F1B */ u8 npc_force_go_home; /* when set to 1, forces the 'm_go_home' code to activate */
|
||||
/* 0x020F1C */ u16 deposit[FG_BLOCK_X_NUM * FG_BLOCK_Z_NUM][UT_Z_NUM]; /* flags for which items are buried around town */
|
||||
/* 0x0212DC */ lbRTC_time_c last_grow_time; /* last time that a new villager moved into town */
|
||||
/* 0x0212E4 */ u8 _tmp4[0x02131C - 0x0212E4];
|
||||
/* 0x0212E4 */ mPr_mother_mail_info_c mother_mail[PLAYER_NUM]; /* info on when mom sent player letters and what event was sent */
|
||||
/* 0x02131C */ mMsr_MushTime_c mushroom_time; /* last time mushroom season info was updated */
|
||||
/* 0x021322 */ u8 _tmp21322[0x02137E - 0x021322];
|
||||
/* 0x02137E */ lbRTC_time_c treasure_buried_time; /* last time treasure was actually buried */
|
||||
|
||||
@@ -109,6 +109,8 @@ enum week_type {
|
||||
};
|
||||
|
||||
enum event_table {
|
||||
mEv_EVENT_MOTHERS_DAY = 23,
|
||||
mEv_EVENT_FATHERS_DAY = 26,
|
||||
mEv_EVENT_FISHING_TOURNEY_1 = 29,
|
||||
mEv_EVENT_MUSHROOM_SEASON = 47,
|
||||
mEv_EVENT_FISHING_TOURNEY_2 = 54,
|
||||
|
||||
@@ -142,6 +142,7 @@ extern void mFI_ClearFieldData();
|
||||
extern int mFI_SetFG_common(mActor_name_t item, xyz_t wpos, int update);
|
||||
extern mActor_name_t* mFI_GetUnitFG(xyz_t wpos);
|
||||
extern void mFI_Wpos2DepositOFF(xyz_t wpos);
|
||||
extern mActor_name_t mFI_GetOtherFruit();
|
||||
|
||||
extern void mFI_PrintNowBGNum(gfxprint_t* gfxprint);
|
||||
extern void mFI_PrintFgAttr(gfxprint_t* gfxprint);
|
||||
|
||||
@@ -13,6 +13,7 @@ extern "C" {
|
||||
#define mHandbill_BODY_LEN MAIL_BODY_LEN
|
||||
|
||||
extern void mHandbill_Load_HandbillFromRom(u8* header, int* header_back_pos, u8* footer, u8* body, int handbill_no);
|
||||
extern void mHandbill_Load_HandbillFromRom2(u8* header, int header_size, int* header_back_pos, u8* footer, int footer_size, u8* body, int handbill_no);
|
||||
extern void mHandbill_Set_free_str(int free_str_no, u8* str, int str_len);
|
||||
extern void mHandbill_Set_free_str_art(int free_str_no, u8* str, int str_len, int article_no);
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "types.h"
|
||||
#include "m_play_h.h"
|
||||
#include "m_actor_type.h"
|
||||
#include "MSL_C/math.h"
|
||||
#include "sys_math.h"
|
||||
#include "libu64/u64types.h"
|
||||
#include "game.h"
|
||||
|
||||
|
||||
@@ -61,6 +61,10 @@ typedef struct mail_s {
|
||||
|
||||
extern int mMl_strlen(u8* str, int maxlen, u8 check_char);
|
||||
extern void mMl_clear_mail_box(Mail_c* mail_box, int count);
|
||||
extern void mMl_clear_mail(Mail_c* mail);
|
||||
extern void mMl_set_to_plname(Mail_c* mail, PersonalID_c* pid);
|
||||
extern int mMl_chk_mail_free_space(Mail_c* mailbox, int count);
|
||||
extern void mMl_copy_mail(Mail_c* dst, Mail_c* src);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
+352
-12
@@ -324,6 +324,16 @@ extern int mNT_check_unknown(mActor_name_t item_no);
|
||||
|
||||
#define FTR0_START 0x1000
|
||||
|
||||
#define FTR_PAPA_BEAR 0x10E8
|
||||
#define FTR_PAPA_BEAR_EAST 0x10E9
|
||||
#define FTR_PAPA_BEAR_NORTH 0x10EA
|
||||
#define FTR_PAPA_BEAR_WEST 0x10EB
|
||||
|
||||
#define FTR_DRACAENA 0x13B0
|
||||
#define FTR_DRACAENA_EAST 0x13B1
|
||||
#define FTR_DRACAENA_NORTH 0x13B2
|
||||
#define FTR_DRACAENA_WEST 0x13B3
|
||||
|
||||
#define FTR_CLOTH_MANNIQUIN000_SOUTH 0x17AC
|
||||
|
||||
#define FTR_REDALOHASHIRT 0x1814
|
||||
@@ -334,10 +344,29 @@ extern int mNT_check_unknown(mActor_name_t item_no);
|
||||
#define FTR_CLOTH_MANNIQUIN254_WEST 0x1BA7
|
||||
#define FTR_CLOTH_MANNIQUIN_MY_ORIGINAL0 0x1BA8
|
||||
|
||||
#define FTR_INSECT00 0x1BC8
|
||||
|
||||
#define FTR_INSECT39 0x1C64
|
||||
#define FTR_INSECT39_EAST 0x1C65
|
||||
#define FTR_INSECT39_NORTH 0x1C66
|
||||
#define FTR_INSECT39_WEST 0x1C67
|
||||
|
||||
#define FTR_FISH00 0x1C68
|
||||
|
||||
#define FTR_FISH39 0x1D04
|
||||
#define FTR_FISH39_EAST 0x1D05
|
||||
#define FTR_FISH39_NORTH 0x1D06
|
||||
#define FTR_FISH39_WEST 0x1D07
|
||||
|
||||
#define FTR_UMBRELLA00_SOUTH 0x1D08
|
||||
|
||||
#define FTR_UMBRELLA31_WEST 0x1D87
|
||||
|
||||
#define FTR_BIRTHDAY_CAKE 0x11FC
|
||||
#define FTR_BIRTHDAY_CAKE_EAST 0x11FD
|
||||
#define FTR_BIRTHDAY_CAKE_NORTH 0x11FE
|
||||
#define FTR_BIRTHDAY_CAKE_WEST 0x11FF
|
||||
|
||||
#define FTR0_END 0x1FFF
|
||||
|
||||
#define FTR_TAPEDECK 0x1E58
|
||||
@@ -423,20 +452,329 @@ extern int mNT_check_unknown(mActor_name_t item_no);
|
||||
#define ITM_TOOL_END (ITM_LEAF_FAN + 1)
|
||||
|
||||
#define ITM_CLOTH_START 0x2400
|
||||
#define ITM_CLOTH000 ITM_CLOTH_START
|
||||
#define ITM_CLOTH001 (ITM_CLOTH_START + 1)
|
||||
#define ITM_CLOTH_END 0x24FF
|
||||
#define ITM_CLOTH000 (ITM_CLOTH_START + 0)
|
||||
#define ITM_CLOTH001 (ITM_CLOTH_START + 1)
|
||||
#define ITM_CLOTH002 (ITM_CLOTH_START + 2)
|
||||
#define ITM_CLOTH003 (ITM_CLOTH_START + 3)
|
||||
#define ITM_CLOTH004 (ITM_CLOTH_START + 4)
|
||||
#define ITM_CLOTH005 (ITM_CLOTH_START + 5)
|
||||
#define ITM_CLOTH006 (ITM_CLOTH_START + 6)
|
||||
#define ITM_CLOTH007 (ITM_CLOTH_START + 7)
|
||||
#define ITM_CLOTH008 (ITM_CLOTH_START + 8)
|
||||
#define ITM_CLOTH009 (ITM_CLOTH_START + 9)
|
||||
#define ITM_CLOTH010 (ITM_CLOTH_START + 10)
|
||||
#define ITM_CLOTH011 (ITM_CLOTH_START + 11)
|
||||
#define ITM_CLOTH012 (ITM_CLOTH_START + 12)
|
||||
#define ITM_CLOTH013 (ITM_CLOTH_START + 13)
|
||||
#define ITM_CLOTH014 (ITM_CLOTH_START + 14)
|
||||
#define ITM_CLOTH015 (ITM_CLOTH_START + 15)
|
||||
#define ITM_CLOTH016 (ITM_CLOTH_START + 16)
|
||||
#define ITM_CLOTH017 (ITM_CLOTH_START + 17)
|
||||
#define ITM_CLOTH018 (ITM_CLOTH_START + 18)
|
||||
#define ITM_CLOTH019 (ITM_CLOTH_START + 19)
|
||||
#define ITM_CLOTH020 (ITM_CLOTH_START + 20)
|
||||
#define ITM_CLOTH021 (ITM_CLOTH_START + 21)
|
||||
#define ITM_CLOTH022 (ITM_CLOTH_START + 22)
|
||||
#define ITM_CLOTH023 (ITM_CLOTH_START + 23)
|
||||
#define ITM_CLOTH024 (ITM_CLOTH_START + 24)
|
||||
#define ITM_CLOTH025 (ITM_CLOTH_START + 25)
|
||||
#define ITM_CLOTH026 (ITM_CLOTH_START + 26)
|
||||
#define ITM_CLOTH027 (ITM_CLOTH_START + 27)
|
||||
#define ITM_CLOTH028 (ITM_CLOTH_START + 28)
|
||||
#define ITM_CLOTH029 (ITM_CLOTH_START + 29)
|
||||
#define ITM_CLOTH030 (ITM_CLOTH_START + 30)
|
||||
#define ITM_CLOTH031 (ITM_CLOTH_START + 31)
|
||||
#define ITM_CLOTH032 (ITM_CLOTH_START + 32)
|
||||
#define ITM_CLOTH033 (ITM_CLOTH_START + 33)
|
||||
#define ITM_CLOTH034 (ITM_CLOTH_START + 34)
|
||||
#define ITM_CLOTH035 (ITM_CLOTH_START + 35)
|
||||
#define ITM_CLOTH036 (ITM_CLOTH_START + 36)
|
||||
#define ITM_CLOTH037 (ITM_CLOTH_START + 37)
|
||||
#define ITM_CLOTH038 (ITM_CLOTH_START + 38)
|
||||
#define ITM_CLOTH039 (ITM_CLOTH_START + 39)
|
||||
#define ITM_CLOTH040 (ITM_CLOTH_START + 40)
|
||||
#define ITM_CLOTH041 (ITM_CLOTH_START + 41)
|
||||
#define ITM_CLOTH042 (ITM_CLOTH_START + 42)
|
||||
#define ITM_CLOTH043 (ITM_CLOTH_START + 43)
|
||||
#define ITM_CLOTH044 (ITM_CLOTH_START + 44)
|
||||
#define ITM_CLOTH045 (ITM_CLOTH_START + 45)
|
||||
#define ITM_CLOTH046 (ITM_CLOTH_START + 46)
|
||||
#define ITM_CLOTH047 (ITM_CLOTH_START + 47)
|
||||
#define ITM_CLOTH048 (ITM_CLOTH_START + 48)
|
||||
#define ITM_CLOTH049 (ITM_CLOTH_START + 49)
|
||||
#define ITM_CLOTH050 (ITM_CLOTH_START + 50)
|
||||
#define ITM_CLOTH051 (ITM_CLOTH_START + 51)
|
||||
#define ITM_CLOTH052 (ITM_CLOTH_START + 52)
|
||||
#define ITM_CLOTH053 (ITM_CLOTH_START + 53)
|
||||
#define ITM_CLOTH054 (ITM_CLOTH_START + 54)
|
||||
#define ITM_CLOTH055 (ITM_CLOTH_START + 55)
|
||||
#define ITM_CLOTH056 (ITM_CLOTH_START + 56)
|
||||
#define ITM_CLOTH057 (ITM_CLOTH_START + 57)
|
||||
#define ITM_CLOTH058 (ITM_CLOTH_START + 58)
|
||||
#define ITM_CLOTH059 (ITM_CLOTH_START + 59)
|
||||
#define ITM_CLOTH060 (ITM_CLOTH_START + 60)
|
||||
#define ITM_CLOTH061 (ITM_CLOTH_START + 61)
|
||||
#define ITM_CLOTH062 (ITM_CLOTH_START + 62)
|
||||
#define ITM_CLOTH063 (ITM_CLOTH_START + 63)
|
||||
#define ITM_CLOTH064 (ITM_CLOTH_START + 64)
|
||||
#define ITM_CLOTH065 (ITM_CLOTH_START + 65)
|
||||
#define ITM_CLOTH066 (ITM_CLOTH_START + 66)
|
||||
#define ITM_CLOTH067 (ITM_CLOTH_START + 67)
|
||||
#define ITM_CLOTH068 (ITM_CLOTH_START + 68)
|
||||
#define ITM_CLOTH069 (ITM_CLOTH_START + 69)
|
||||
#define ITM_CLOTH070 (ITM_CLOTH_START + 70)
|
||||
#define ITM_CLOTH071 (ITM_CLOTH_START + 71)
|
||||
#define ITM_CLOTH072 (ITM_CLOTH_START + 72)
|
||||
#define ITM_CLOTH073 (ITM_CLOTH_START + 73)
|
||||
#define ITM_CLOTH074 (ITM_CLOTH_START + 74)
|
||||
#define ITM_CLOTH075 (ITM_CLOTH_START + 75)
|
||||
#define ITM_CLOTH076 (ITM_CLOTH_START + 76)
|
||||
#define ITM_CLOTH077 (ITM_CLOTH_START + 77)
|
||||
#define ITM_CLOTH078 (ITM_CLOTH_START + 78)
|
||||
#define ITM_CLOTH079 (ITM_CLOTH_START + 79)
|
||||
#define ITM_CLOTH080 (ITM_CLOTH_START + 80)
|
||||
#define ITM_CLOTH081 (ITM_CLOTH_START + 81)
|
||||
#define ITM_CLOTH082 (ITM_CLOTH_START + 82)
|
||||
#define ITM_CLOTH083 (ITM_CLOTH_START + 83)
|
||||
#define ITM_CLOTH084 (ITM_CLOTH_START + 84)
|
||||
#define ITM_CLOTH085 (ITM_CLOTH_START + 85)
|
||||
#define ITM_CLOTH086 (ITM_CLOTH_START + 86)
|
||||
#define ITM_CLOTH087 (ITM_CLOTH_START + 87)
|
||||
#define ITM_CLOTH088 (ITM_CLOTH_START + 88)
|
||||
#define ITM_CLOTH089 (ITM_CLOTH_START + 89)
|
||||
#define ITM_CLOTH090 (ITM_CLOTH_START + 90)
|
||||
#define ITM_CLOTH091 (ITM_CLOTH_START + 91)
|
||||
#define ITM_CLOTH092 (ITM_CLOTH_START + 92)
|
||||
#define ITM_CLOTH093 (ITM_CLOTH_START + 93)
|
||||
#define ITM_CLOTH094 (ITM_CLOTH_START + 94)
|
||||
#define ITM_CLOTH095 (ITM_CLOTH_START + 95)
|
||||
#define ITM_CLOTH096 (ITM_CLOTH_START + 96)
|
||||
#define ITM_CLOTH097 (ITM_CLOTH_START + 97)
|
||||
#define ITM_CLOTH098 (ITM_CLOTH_START + 98)
|
||||
#define ITM_CLOTH099 (ITM_CLOTH_START + 99)
|
||||
#define ITM_CLOTH100 (ITM_CLOTH_START + 100)
|
||||
#define ITM_CLOTH101 (ITM_CLOTH_START + 101)
|
||||
#define ITM_CLOTH102 (ITM_CLOTH_START + 102)
|
||||
#define ITM_CLOTH103 (ITM_CLOTH_START + 103)
|
||||
#define ITM_CLOTH104 (ITM_CLOTH_START + 104)
|
||||
#define ITM_CLOTH105 (ITM_CLOTH_START + 105)
|
||||
#define ITM_CLOTH106 (ITM_CLOTH_START + 106)
|
||||
#define ITM_CLOTH107 (ITM_CLOTH_START + 107)
|
||||
#define ITM_CLOTH108 (ITM_CLOTH_START + 108)
|
||||
#define ITM_CLOTH109 (ITM_CLOTH_START + 109)
|
||||
#define ITM_CLOTH110 (ITM_CLOTH_START + 110)
|
||||
#define ITM_CLOTH111 (ITM_CLOTH_START + 111)
|
||||
#define ITM_CLOTH112 (ITM_CLOTH_START + 112)
|
||||
#define ITM_CLOTH113 (ITM_CLOTH_START + 113)
|
||||
#define ITM_CLOTH114 (ITM_CLOTH_START + 114)
|
||||
#define ITM_CLOTH115 (ITM_CLOTH_START + 115)
|
||||
#define ITM_CLOTH116 (ITM_CLOTH_START + 116)
|
||||
#define ITM_CLOTH117 (ITM_CLOTH_START + 117)
|
||||
#define ITM_CLOTH118 (ITM_CLOTH_START + 118)
|
||||
#define ITM_CLOTH119 (ITM_CLOTH_START + 119)
|
||||
#define ITM_CLOTH120 (ITM_CLOTH_START + 120)
|
||||
#define ITM_CLOTH121 (ITM_CLOTH_START + 121)
|
||||
#define ITM_CLOTH122 (ITM_CLOTH_START + 122)
|
||||
#define ITM_CLOTH123 (ITM_CLOTH_START + 123)
|
||||
#define ITM_CLOTH124 (ITM_CLOTH_START + 124)
|
||||
#define ITM_CLOTH125 (ITM_CLOTH_START + 125)
|
||||
#define ITM_CLOTH126 (ITM_CLOTH_START + 126)
|
||||
#define ITM_CLOTH127 (ITM_CLOTH_START + 127)
|
||||
#define ITM_CLOTH128 (ITM_CLOTH_START + 128)
|
||||
#define ITM_CLOTH129 (ITM_CLOTH_START + 129)
|
||||
#define ITM_CLOTH130 (ITM_CLOTH_START + 130)
|
||||
#define ITM_CLOTH131 (ITM_CLOTH_START + 131)
|
||||
#define ITM_CLOTH132 (ITM_CLOTH_START + 132)
|
||||
#define ITM_CLOTH133 (ITM_CLOTH_START + 133)
|
||||
#define ITM_CLOTH134 (ITM_CLOTH_START + 134)
|
||||
#define ITM_CLOTH135 (ITM_CLOTH_START + 135)
|
||||
#define ITM_CLOTH136 (ITM_CLOTH_START + 136)
|
||||
#define ITM_CLOTH137 (ITM_CLOTH_START + 137)
|
||||
#define ITM_CLOTH138 (ITM_CLOTH_START + 138)
|
||||
#define ITM_CLOTH139 (ITM_CLOTH_START + 139)
|
||||
#define ITM_CLOTH140 (ITM_CLOTH_START + 140)
|
||||
#define ITM_CLOTH141 (ITM_CLOTH_START + 141)
|
||||
#define ITM_CLOTH142 (ITM_CLOTH_START + 142)
|
||||
#define ITM_CLOTH143 (ITM_CLOTH_START + 143)
|
||||
#define ITM_CLOTH144 (ITM_CLOTH_START + 144)
|
||||
#define ITM_CLOTH145 (ITM_CLOTH_START + 145)
|
||||
#define ITM_CLOTH146 (ITM_CLOTH_START + 146)
|
||||
#define ITM_CLOTH147 (ITM_CLOTH_START + 147)
|
||||
#define ITM_CLOTH148 (ITM_CLOTH_START + 148)
|
||||
#define ITM_CLOTH149 (ITM_CLOTH_START + 149)
|
||||
#define ITM_CLOTH150 (ITM_CLOTH_START + 150)
|
||||
#define ITM_CLOTH151 (ITM_CLOTH_START + 151)
|
||||
#define ITM_CLOTH152 (ITM_CLOTH_START + 152)
|
||||
#define ITM_CLOTH153 (ITM_CLOTH_START + 153)
|
||||
#define ITM_CLOTH154 (ITM_CLOTH_START + 154)
|
||||
#define ITM_CLOTH155 (ITM_CLOTH_START + 155)
|
||||
#define ITM_CLOTH156 (ITM_CLOTH_START + 156)
|
||||
#define ITM_CLOTH157 (ITM_CLOTH_START + 157)
|
||||
#define ITM_CLOTH158 (ITM_CLOTH_START + 158)
|
||||
#define ITM_CLOTH159 (ITM_CLOTH_START + 159)
|
||||
#define ITM_CLOTH160 (ITM_CLOTH_START + 160)
|
||||
#define ITM_CLOTH161 (ITM_CLOTH_START + 161)
|
||||
#define ITM_CLOTH162 (ITM_CLOTH_START + 162)
|
||||
#define ITM_CLOTH163 (ITM_CLOTH_START + 163)
|
||||
#define ITM_CLOTH164 (ITM_CLOTH_START + 164)
|
||||
#define ITM_CLOTH165 (ITM_CLOTH_START + 165)
|
||||
#define ITM_CLOTH166 (ITM_CLOTH_START + 166)
|
||||
#define ITM_CLOTH167 (ITM_CLOTH_START + 167)
|
||||
#define ITM_CLOTH168 (ITM_CLOTH_START + 168)
|
||||
#define ITM_CLOTH169 (ITM_CLOTH_START + 169)
|
||||
#define ITM_CLOTH170 (ITM_CLOTH_START + 170)
|
||||
#define ITM_CLOTH171 (ITM_CLOTH_START + 171)
|
||||
#define ITM_CLOTH172 (ITM_CLOTH_START + 172)
|
||||
#define ITM_CLOTH173 (ITM_CLOTH_START + 173)
|
||||
#define ITM_CLOTH174 (ITM_CLOTH_START + 174)
|
||||
#define ITM_CLOTH175 (ITM_CLOTH_START + 175)
|
||||
#define ITM_CLOTH176 (ITM_CLOTH_START + 176)
|
||||
#define ITM_CLOTH177 (ITM_CLOTH_START + 177)
|
||||
#define ITM_CLOTH178 (ITM_CLOTH_START + 178)
|
||||
#define ITM_CLOTH179 (ITM_CLOTH_START + 179)
|
||||
#define ITM_CLOTH180 (ITM_CLOTH_START + 180)
|
||||
#define ITM_CLOTH181 (ITM_CLOTH_START + 181)
|
||||
#define ITM_CLOTH182 (ITM_CLOTH_START + 182)
|
||||
#define ITM_CLOTH183 (ITM_CLOTH_START + 183)
|
||||
#define ITM_CLOTH184 (ITM_CLOTH_START + 184)
|
||||
#define ITM_CLOTH185 (ITM_CLOTH_START + 185)
|
||||
#define ITM_CLOTH186 (ITM_CLOTH_START + 186)
|
||||
#define ITM_CLOTH187 (ITM_CLOTH_START + 187)
|
||||
#define ITM_CLOTH188 (ITM_CLOTH_START + 188)
|
||||
#define ITM_CLOTH189 (ITM_CLOTH_START + 189)
|
||||
#define ITM_CLOTH190 (ITM_CLOTH_START + 190)
|
||||
#define ITM_CLOTH191 (ITM_CLOTH_START + 191)
|
||||
#define ITM_CLOTH192 (ITM_CLOTH_START + 192)
|
||||
#define ITM_CLOTH193 (ITM_CLOTH_START + 193)
|
||||
#define ITM_CLOTH194 (ITM_CLOTH_START + 194)
|
||||
#define ITM_CLOTH195 (ITM_CLOTH_START + 195)
|
||||
#define ITM_CLOTH196 (ITM_CLOTH_START + 196)
|
||||
#define ITM_CLOTH197 (ITM_CLOTH_START + 197)
|
||||
#define ITM_CLOTH198 (ITM_CLOTH_START + 198)
|
||||
#define ITM_CLOTH199 (ITM_CLOTH_START + 199)
|
||||
#define ITM_CLOTH200 (ITM_CLOTH_START + 200)
|
||||
#define ITM_CLOTH201 (ITM_CLOTH_START + 201)
|
||||
#define ITM_CLOTH202 (ITM_CLOTH_START + 202)
|
||||
#define ITM_CLOTH203 (ITM_CLOTH_START + 203)
|
||||
#define ITM_CLOTH204 (ITM_CLOTH_START + 204)
|
||||
#define ITM_CLOTH205 (ITM_CLOTH_START + 205)
|
||||
#define ITM_CLOTH206 (ITM_CLOTH_START + 206)
|
||||
#define ITM_CLOTH207 (ITM_CLOTH_START + 207)
|
||||
#define ITM_CLOTH208 (ITM_CLOTH_START + 208)
|
||||
#define ITM_CLOTH209 (ITM_CLOTH_START + 209)
|
||||
#define ITM_CLOTH210 (ITM_CLOTH_START + 210)
|
||||
#define ITM_CLOTH211 (ITM_CLOTH_START + 211)
|
||||
#define ITM_CLOTH212 (ITM_CLOTH_START + 212)
|
||||
#define ITM_CLOTH213 (ITM_CLOTH_START + 213)
|
||||
#define ITM_CLOTH214 (ITM_CLOTH_START + 214)
|
||||
#define ITM_CLOTH215 (ITM_CLOTH_START + 215)
|
||||
#define ITM_CLOTH216 (ITM_CLOTH_START + 216)
|
||||
#define ITM_CLOTH217 (ITM_CLOTH_START + 217)
|
||||
#define ITM_CLOTH218 (ITM_CLOTH_START + 218)
|
||||
#define ITM_CLOTH219 (ITM_CLOTH_START + 219)
|
||||
#define ITM_CLOTH220 (ITM_CLOTH_START + 220)
|
||||
#define ITM_CLOTH221 (ITM_CLOTH_START + 221)
|
||||
#define ITM_CLOTH222 (ITM_CLOTH_START + 222)
|
||||
#define ITM_CLOTH223 (ITM_CLOTH_START + 223)
|
||||
#define ITM_CLOTH224 (ITM_CLOTH_START + 224)
|
||||
#define ITM_CLOTH225 (ITM_CLOTH_START + 225)
|
||||
#define ITM_CLOTH226 (ITM_CLOTH_START + 226)
|
||||
#define ITM_CLOTH227 (ITM_CLOTH_START + 227)
|
||||
#define ITM_CLOTH228 (ITM_CLOTH_START + 228)
|
||||
#define ITM_CLOTH229 (ITM_CLOTH_START + 229)
|
||||
#define ITM_CLOTH230 (ITM_CLOTH_START + 230)
|
||||
#define ITM_CLOTH231 (ITM_CLOTH_START + 231)
|
||||
#define ITM_CLOTH232 (ITM_CLOTH_START + 232)
|
||||
#define ITM_CLOTH233 (ITM_CLOTH_START + 233)
|
||||
#define ITM_CLOTH234 (ITM_CLOTH_START + 234)
|
||||
#define ITM_CLOTH235 (ITM_CLOTH_START + 235)
|
||||
#define ITM_CLOTH236 (ITM_CLOTH_START + 236)
|
||||
#define ITM_CLOTH237 (ITM_CLOTH_START + 237)
|
||||
#define ITM_CLOTH238 (ITM_CLOTH_START + 238)
|
||||
#define ITM_CLOTH239 (ITM_CLOTH_START + 239)
|
||||
#define ITM_CLOTH240 (ITM_CLOTH_START + 240)
|
||||
#define ITM_CLOTH241 (ITM_CLOTH_START + 241)
|
||||
#define ITM_CLOTH242 (ITM_CLOTH_START + 242)
|
||||
#define ITM_CLOTH243 (ITM_CLOTH_START + 243)
|
||||
#define ITM_CLOTH244 (ITM_CLOTH_START + 244)
|
||||
#define ITM_CLOTH245 (ITM_CLOTH_START + 245)
|
||||
#define ITM_CLOTH246 (ITM_CLOTH_START + 246)
|
||||
#define ITM_CLOTH247 (ITM_CLOTH_START + 247)
|
||||
#define ITM_CLOTH248 (ITM_CLOTH_START + 248)
|
||||
#define ITM_CLOTH249 (ITM_CLOTH_START + 249)
|
||||
#define ITM_CLOTH250 (ITM_CLOTH_START + 250)
|
||||
#define ITM_CLOTH251 (ITM_CLOTH_START + 251)
|
||||
#define ITM_CLOTH252 (ITM_CLOTH_START + 252)
|
||||
#define ITM_CLOTH253 (ITM_CLOTH_START + 253)
|
||||
#define ITM_CLOTH254 (ITM_CLOTH_START + 254)
|
||||
#define ITM_CLOTH_END (ITM_CLOTH_START + 255)
|
||||
|
||||
#define ITM_DUST0_EMPTY_CAN 0x250E
|
||||
#define ITM_DUST1_BOOT 0x250F
|
||||
#define ITM_DUST2_OLD_TIRE 0x2510
|
||||
#define ITM_PITFALL 0x2512
|
||||
#define ITM_SIGNBOARD 0x251E
|
||||
#define ITM_ETC_START 0x2500
|
||||
#define ITM_QST_LETTER ITM_ETC_START
|
||||
#define ITM_QST_CLOTH (ITM_QST_LETTER + 1)
|
||||
#define ITM_QST_MONEY (ITM_QST_CLOTH + 1)
|
||||
#define ITM_QST_VIDEOTAPE (ITM_QST_MONEY + 1)
|
||||
#define ITM_QST_ORGANIZER (ITM_QST_VIDEOTAPE + 1)
|
||||
#define ITM_QST_POKEMON_PIKACHU (ITM_QST_ORGANIZER + 1)
|
||||
#define ITM_QST_COMIC_BOOK (ITM_QST_POKEMON_PIKACHU + 1)
|
||||
#define ITM_QST_PICTURE_BOOK (ITM_QST_COMIC_BOOK + 1)
|
||||
#define ITM_QST_GAME_BOY (ITM_QST_PICTURE_BOOK + 1)
|
||||
#define ITM_QST_CAMREA (ITM_QST_GAME_BOY + 1)
|
||||
#define ITM_QST_WATCH (ITM_QST_CAMREA + 1)
|
||||
#define ITM_QST_HANDKERCHIEF (ITM_QST_WATCH + 1)
|
||||
#define ITM_QST_GLASSES_CASE (ITM_QST_HANDKERCHIEF + 1)
|
||||
#define ITM_MONEY1000BELL (ITM_QST_GLASSES_CASE + 1)
|
||||
#define ITM_DUST0_EMPTY_CAN (ITM_MONEY1000BELL + 1)
|
||||
#define ITM_DUST1_BOOT (ITM_DUST0_EMPTY_CAN + 1)
|
||||
#define ITM_DUST2_OLD_TIRE (ITM_DUST1_BOOT + 1)
|
||||
#define ITM_FOSSIL (ITM_DUST2_OLD_TIRE + 1)
|
||||
#define ITM_PITFALL (ITM_FOSSIL + 1)
|
||||
#define ITM_FORTUNE_SLIP (ITM_PITFALL + 1)
|
||||
#define ITM_SHELL0 (ITM_FORTUNE_SLIP + 1)
|
||||
#define ITM_SHELL1 (ITM_SHELL0 + 1)
|
||||
#define ITM_SHELL2 (ITM_SHELL1 + 1)
|
||||
#define ITM_SHELL3 (ITM_SHELL2 + 1)
|
||||
#define ITM_SHELL4 (ITM_SHELL3 + 1)
|
||||
#define ITM_SHELL5 (ITM_SHELL4 + 1)
|
||||
#define ITM_SHELL6 (ITM_SHELL5 + 1)
|
||||
#define ITM_SHELL7 (ITM_SHELL6 + 1)
|
||||
#define ITM_PRESENT (ITM_SHELL7 + 1)
|
||||
#define ITM_TOWN_MAP (ITM_PRESENT + 1)
|
||||
#define ITM_SIGNBOARD (ITM_TOWN_MAP + 1)
|
||||
#define ITM_GOLDEN_NET_PRESENT (ITM_SIGNBOARD + 1)
|
||||
#define ITM_GOLDEN_AXE_PRESENT (ITM_GOLDEN_NET_PRESENT + 1)
|
||||
#define ITM_GOLDEN_SHOVEL_PRESENT (ITM_GOLDEN_AXE_PRESENT + 1)
|
||||
#define ITM_GOLDEN_ROD_PRESENT (ITM_GOLDEN_SHOVEL_PRESENT + 1)
|
||||
#define ITM_EXCERCISE_CARD00 (ITM_GOLDEN_ROD_PRESENT + 1)
|
||||
#define ITM_EXCERCISE_CARD01 (ITM_EXCERCISE_CARD00 + 1)
|
||||
#define ITM_EXCERCISE_CARD02 (ITM_EXCERCISE_CARD01 + 1)
|
||||
#define ITM_EXCERCISE_CARD03 (ITM_EXCERCISE_CARD02 + 1)
|
||||
#define ITM_EXCERCISE_CARD04 (ITM_EXCERCISE_CARD03 + 1)
|
||||
#define ITM_EXCERCISE_CARD05 (ITM_EXCERCISE_CARD04 + 1)
|
||||
#define ITM_EXCERCISE_CARD06 (ITM_EXCERCISE_CARD05 + 1)
|
||||
#define ITM_EXCERCISE_CARD07 (ITM_EXCERCISE_CARD06 + 1)
|
||||
#define ITM_EXCERCISE_CARD08 (ITM_EXCERCISE_CARD07 + 1)
|
||||
#define ITM_EXCERCISE_CARD09 (ITM_EXCERCISE_CARD08 + 1)
|
||||
#define ITM_EXCERCISE_CARD10 (ITM_EXCERCISE_CARD09 + 1)
|
||||
#define ITM_EXCERCISE_CARD11 (ITM_EXCERCISE_CARD10 + 1)
|
||||
#define ITM_EXCERCISE_CARD12 (ITM_EXCERCISE_CARD11 + 1)
|
||||
#define ITM_KNIFE_AND_FORK (ITM_EXCERCISE_CARD12 + 1)
|
||||
#define ITM_ETC_END 0x2531
|
||||
|
||||
#define ITM_CARPET_START 0x2600
|
||||
|
||||
#define ITM_WALL_START 0x2700
|
||||
|
||||
#define ITM_FOOD_START 0x2800
|
||||
|
||||
#define ITM_FOOD_MUSHROOM 0x2805
|
||||
#define ITM_FOOD_CANDY 0x2806
|
||||
#define ITM_FOOD_APPLE ITM_FOOD_START
|
||||
#define ITM_FOOD_CHERRY (ITM_FOOD_APPLE + 1)
|
||||
#define ITM_FOOD_PEAR (ITM_FOOD_CHERRY + 1)
|
||||
#define ITM_FOOD_PEACH (ITM_FOOD_PEAR + 1)
|
||||
#define ITM_FOOD_ORANGE (ITM_FOOD_PEACH + 1)
|
||||
#define ITM_FOOD_MUSHROOM (ITM_FOOD_ORANGE + 1)
|
||||
#define ITM_FOOD_CANDY (ITM_FOOD_MUSHROOM + 1)
|
||||
#define ITM_FOOD_COCONUT (ITM_FOOD_CANDY + 1)
|
||||
#define ITM_FOOD_END 0x2808
|
||||
|
||||
#define ITM_ENV_START 0x2900
|
||||
#define ITM_SAPLING ITM_ENV_START
|
||||
@@ -449,7 +787,9 @@ extern int mNT_check_unknown(mActor_name_t item_no);
|
||||
#define ITM_BLUE_COSMOS_BAG 0x2907
|
||||
#define ITM_RED_TULIP_BAG 0x2908
|
||||
#define ITM_WHITE_TULIP_BAG 0x2909
|
||||
#define ITEM_YELLOW_TULIP_BAG 0x290A
|
||||
#define ITM_YELLOW_TULIP_BAG 0x290A
|
||||
|
||||
#define ITM_MINIDISK_START 0x2A00
|
||||
|
||||
#define ITM_DIARY_START 0x2B00
|
||||
#define ITM_COLLEGERULE ITM_DIARY_START
|
||||
|
||||
@@ -201,6 +201,10 @@ extern Animal_c* mNpc_GetInAnimalP();
|
||||
extern int mNpc_GetLooks2Sex(int looks);
|
||||
extern int mNpc_CheckFreeAnimalInfo(Animal_c* animal);
|
||||
extern int mNpc_GetFriendAnimalNum(Private_c* private_p);
|
||||
extern int mNpc_GetLooks(mActor_name_t npc_name);
|
||||
extern void mNpc_LoadNpcNameString(u8* buf, u8 idx);
|
||||
extern u8 mNpc_GetPaperType();
|
||||
extern void mMl_set_mail_name_npcinfo(Mail_nm_c* mail_name, AnmPersonalID_c* anm_pid);
|
||||
|
||||
extern void mNpc_PrintRemoveInfo(gfxprint_t* gfxprint);
|
||||
extern void mNpc_PrintFriendship_fdebug(gfxprint_t* gfxprint);
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "types.h"
|
||||
#include "m_player.h"
|
||||
#include "m_private_h.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -20,6 +21,7 @@ extern void mPlib_Set_able_force_speak_label(ACTOR* actor);
|
||||
extern int mPlib_request_main_demo_walk_type1(GAME* game, f32 goal_x, f32 goal_z, f32 speed, int flag);
|
||||
extern void mPlib_Set_goal_player_demo_walk(f32 goal_x, f32 goal_z, f32 speed);
|
||||
extern void mPlib_Set_able_hand_all_item_in_demo(s8 enable);
|
||||
extern void mPlib_change_player_cloth_info_lv2(Private_c* priv, mActor_name_t cloth_name);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -11,6 +11,14 @@ extern "C" {
|
||||
|
||||
#define mPO_MAIL_STORAGE_SIZE 5
|
||||
|
||||
enum {
|
||||
mPO_SENDTYPE_MAIL,
|
||||
mPO_SENDTYPE_LEAFLET,
|
||||
mPO_SENDTYPE_EVENT_LEAFLET,
|
||||
|
||||
mPO_SENDTYPE_NUM
|
||||
};
|
||||
|
||||
/* sizeof(PostOffice_c) == 0x83C */
|
||||
typedef struct post_office_s {
|
||||
/* 0x000 */ s16 keep_mail_sum_players; /* sum of stored mail from players, see mPO_get_keep_mail_sum */
|
||||
@@ -33,6 +41,9 @@ typedef struct post_office_s {
|
||||
/* 0x834 */ lbRTC_time_c delivery_time; /* time when Pete should 'deliver' the mail */
|
||||
} PostOffice_c;
|
||||
|
||||
extern int mPO_get_keep_mail_sum();
|
||||
extern int mPO_receipt_proc(Mail_c* mail, int type);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
+77
-15
@@ -70,6 +70,8 @@ enum {
|
||||
#define mPr_FOREIGN_MAP_COUNT 8
|
||||
#define mPr_ORIGINAL_DESIGN_COUNT 8
|
||||
|
||||
#define mPr_GET_ITEM_COND(all_cond, slot_no) (((all_cond) >> (2 * (slot_no))) & 3)
|
||||
|
||||
enum {
|
||||
mPr_SUNBURN_RANK_MIN,
|
||||
|
||||
@@ -147,6 +149,20 @@ typedef struct player_ecard_data_s {
|
||||
/* 0x04 */ u8 card_letters_sent[mPr_ECARD_LETTER_NUM]; /* bitfield keeping track of which eCard letters have been sent to the player [0, 366] */
|
||||
} mPr_carde_data_c;
|
||||
|
||||
#define mPr_MOTHER_MAIL_NORMAL_NUM 7
|
||||
#define mPr_MOTHER_MAIL_MONTHLY_NUM 2
|
||||
|
||||
typedef struct private_mother_mail_data_s {
|
||||
u8 normal[mPr_MOTHER_MAIL_NORMAL_NUM];
|
||||
u8 monthly[mPr_MOTHER_MAIL_MONTHLY_NUM];
|
||||
u8 august; // unique byte for month of august
|
||||
} mPr_mother_mail_data_c;
|
||||
|
||||
typedef struct private_mother_mail_info_s {
|
||||
lbRTC_ymd_t date;
|
||||
mPr_mother_mail_data_c data;
|
||||
} mPr_mother_mail_info_c;
|
||||
|
||||
struct private_s {
|
||||
/* 0x0000 */ PersonalID_c player_ID; /* player's id info */
|
||||
/* 0x0014 */ s8 gender; /* gender/sex of player */
|
||||
@@ -217,22 +233,68 @@ struct private_s {
|
||||
/* 0x2412 */ u8 unused_2412[46];
|
||||
};
|
||||
|
||||
extern s16 mPr_GetGoodsPower();
|
||||
extern s16 mPr_GetMoneyPower();
|
||||
|
||||
extern int mPr_CheckPrivate(Private_c* private_p);
|
||||
extern void mPr_PrintMapInfo_debug(gfxprint_t* gfxprint);
|
||||
extern int mPr_NullCheckPersonalID(PersonalID_c* pid);
|
||||
extern int mPr_CheckCmpPersonalID(PersonalID_c* pid_a, PersonalID_c* pid_b);
|
||||
extern void mPr_ClearPersonalID(PersonalID_c* pid);
|
||||
extern void mPr_CopyPersonalID(PersonalID_c* dst, PersonalID_c* src);
|
||||
extern void mPr_ClearPrivateInfo(Private_c* private_data);
|
||||
extern int mPr_CheckCmpPlayerName(u8* str0, u8* str1);
|
||||
extern void mPr_RandomSetPlayerData_title_demo();
|
||||
extern int mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item_no, u32 cond);
|
||||
extern int mPr_SetFreePossessionItem(Private_c* priv, mActor_name_t item_no, u32 cond);
|
||||
extern void mPr_CopyPlayerName(u8* dst, Private_c* private_p);
|
||||
extern void mPr_ClearPlayerName(u8* buf);
|
||||
extern void mPr_CopyPlayerName(u8* dst, u8* src);
|
||||
extern int mPr_NullCheckPlayerName(u8* name_p);
|
||||
extern int mPr_CheckCmpPlayerName(u8* name0, u8* name1);
|
||||
extern int mPr_GetPlayerName(u8* buf, int player_no);
|
||||
extern int mPr_NullCheckPersonalID(PersonalID_c* pid);
|
||||
extern void mPr_ClearPersonalID(PersonalID_c* pid);
|
||||
extern void mPr_ClearAnyPersonalID(PersonalID_c* pid, int count);
|
||||
extern void mPr_CopyPersonalID(PersonalID_c* dst, PersonalID_c* src);
|
||||
extern int mPr_CheckCmpPersonalID(PersonalID_c* pid0, PersonalID_c* pid1);
|
||||
extern void mPr_ClearPrivateBirthday(mPr_birthday_c* birthday);
|
||||
extern void mPr_ClearAnimalMemory(mPr_animal_memory_c* memory);
|
||||
extern void mPr_ClearPrivateInfo(Private_c* private_info);
|
||||
extern void mPr_SetNowPrivateCloth();
|
||||
extern void mPr_InitPrivateInfo(Private_c* priv);
|
||||
extern void mPr_CopyPrivateInfo(Private_c* dst, Private_c* src);
|
||||
extern int mPr_CheckPrivate(Private_c* priv);
|
||||
extern int mPr_CheckCmpPrivate(Private_c* priv0, Private_c* priv1);
|
||||
extern int mPr_GetPrivateIdx(PersonalID_c* pid);
|
||||
extern int mPr_GetPossessionItemIdx(Private_c* priv, mActor_name_t item);
|
||||
extern int mPr_GetPossessionItemIdxWithCond(Private_c* priv, mActor_name_t item, u32 cond);
|
||||
extern int mPr_GetPossessionItemIdxFGTypeWithCond_cancel(Private_c* priv, mActor_name_t fg_type, u32 cond, mActor_name_t cancel_item);
|
||||
extern int mPr_GetPossessionItemIdxItem1Category(Private_c* priv, u8 item1_type);
|
||||
extern int mPr_GetPossessionItemIdxItem1CategoryWithCond_cancel(Private_c* priv, u8 item1_type, u32 cond, mActor_name_t cancel_item);
|
||||
extern int mPr_GetPossessionItemIdxKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end, u32 cond);
|
||||
extern int mPr_GetPossessionItemSum(Private_c* priv, mActor_name_t item);
|
||||
extern int mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item, u32 cond);
|
||||
extern int mPr_GetPossessionItemSumFGTypeWithCond_cancel(Private_c* priv, mActor_name_t fg_type, u32 cond, mActor_name_t cancel_item);
|
||||
extern int mPr_GetPossessionItemSumItemCategoryWithCond_cancel(Private_c* priv, u8 item1_type, u32 cond, mActor_name_t cancel_item);
|
||||
extern int mPr_GetPossessionItemSumItemCategoryWithCond(Private_c* priv, u8 item1_type, u32 cond);
|
||||
extern int mPr_GetPossessionItemSumKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end, u32 cond);
|
||||
extern void mPr_SetItemCollectBit(mActor_name_t item);
|
||||
extern mActor_name_t mPr_DummyPresentToTruePresent();
|
||||
extern void mPr_SetPossessionItem(Private_c* priv, int idx, mActor_name_t item, u32 cond);
|
||||
extern int mPr_SetFreePossessionItem(Private_c* priv, mActor_name_t item, u32 cond);
|
||||
extern void mPr_AddFirstJobHint(Private_c* priv);
|
||||
extern int mPr_GetFirstJobHintTime(Private_c* priv);
|
||||
extern int mPr_CheckFirstJobHint(Private_c* priv);
|
||||
extern s16 mPr_GetMoneyPower();
|
||||
extern s16 mPr_GetGoodsPower();
|
||||
extern int mPr_CheckMuseumAddress(Private_c* priv);
|
||||
extern int mPr_CheckMuseumInfoMail(Private_c* priv);
|
||||
extern Private_c* mPr_GetForeignerP();
|
||||
extern int mPr_LoadPak_and_SetPrivateInfo2(Private_c* unused_private, u8 player_no);
|
||||
extern void mPr_ClearMotherMailInfo(mPr_mother_mail_info_c* mother_mail);
|
||||
extern void mPr_SendMailFromMother();
|
||||
extern void mPr_SendForeingerAnimalMail(Private_c* priv);
|
||||
extern void mPr_StartSetCompleteTalkInfo();
|
||||
extern void mPr_SetFishCompleteTalk();
|
||||
extern int mPr_CheckFishCompleteTalk(u8 player_no);
|
||||
extern void mPr_SetInsectCompleteTalk();
|
||||
extern int mPr_CheckInsectCompleteTalk(u8 player_no);
|
||||
extern int mPr_GetFishCompTalkPermission();
|
||||
extern int mPr_GetInsectCompTalkPermission();
|
||||
extern void mPr_ClearMapInfo(mPr_map_info_c* map_info, int max);
|
||||
extern int mPr_GetThisLandMapIdx(mPr_map_info_c* map_info, int max);
|
||||
extern void mPr_SetNewMap(mPr_map_info_c* map_info, int max);
|
||||
extern void mPr_RenewalMapInfo(mPr_map_info_c* map_info, int max, mLd_land_info_c* land_info);
|
||||
extern void mPr_RandomSetPlayerData_title_demo();
|
||||
extern void mPr_PrintMapInfo_debug(gfxprint_t* gfxprint);
|
||||
|
||||
extern Private_c g_foreigner_private;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -108,5 +108,6 @@ extern mActor_name_t mRmTp_FtrIdx2FtrItemNo(int ftr_idx, int rotation);
|
||||
extern int mRmTp_GetFurnitureData(mActor_name_t ftr, int ut_x, int ut_z, mRmTp_FtrPlaceInfo_t* place_info);
|
||||
extern int mRmTp_FurnitureIdx2FurnitureKind(int ftr_idx);
|
||||
extern int mRmTp_PleaseDrawLightSwitch();
|
||||
extern mActor_name_t mRmTp_Item1ItemNo2FtrItemNo_AtPlayerRoom(mActor_name_t item_no, int flag);
|
||||
|
||||
#endif
|
||||
@@ -104,6 +104,8 @@ struct submenu_s {
|
||||
};
|
||||
|
||||
extern void mSM_open_submenu(Submenu* submenu, int menu_type, int arg0, int arg1);
|
||||
extern int mSM_CHECK_ALL_FISH_GET();
|
||||
extern int mSM_CHECK_ALL_INSECT_GET();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -91,6 +91,8 @@ extern const lbRTC_time_c mTM_rtcTime_default_code;
|
||||
#define mTM_IsTimeCleared(time) (lbRTC_IsEqualTime((time), &mTM_rtcTime_clear_code, lbRTC_CHECK_ALL) == TRUE)
|
||||
#define mTM_AreTimesEqual(t0, t1) (lbRTC_IsEqualTime(t0, t1, lbRTC_CHECK_ALL))
|
||||
|
||||
#define mTM_CheckCmpYMDEqual(ymd0, ymd1) ((ymd0)->year == (ymd1)->year && (ymd0)->month == (ymd1)->month && (ymd0)->day == (ymd1)->day)
|
||||
#define mTM_CheckCmpYMDClear(ymd0) ((ymd0)->year == mTM_rtcTime_ymd_clear_code.year || (ymd0)->month == mTM_rtcTime_ymd_clear_code.month || (ymd0)->day == mTM_rtcTime_ymd_clear_code.day)
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -3,11 +3,17 @@
|
||||
|
||||
#include "types.h"
|
||||
#include "MSL_C/math.h"
|
||||
#include "libc64/qrand.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Macro to generate a random float in the range of [0, n) */
|
||||
#define RANDOM_F(n) (fqrand() * (f32)(n))
|
||||
|
||||
/* Macro to generate a random integer in the range of [0, n) */
|
||||
#define RANDOM(n) ((int)RANDOM_F(n))
|
||||
|
||||
extern u16 U_GetAtanTable(f32 y, f32 x);
|
||||
extern s16 atans_table(f32 x, f32 y);
|
||||
|
||||
+1
-1
@@ -416,7 +416,7 @@ static void mMP_set_house_data(mMP_Overlay_c* map_ovl, mSM_MenuInfo_c* menu) {
|
||||
if (mPr_CheckPrivate(priv) == TRUE &&
|
||||
(Common_Get(now_private) != priv || mEv_CheckFirstIntro() == FALSE)
|
||||
) {
|
||||
mPr_CopyPlayerName(resident_p->name, priv);
|
||||
mPr_CopyPlayerName(resident_p->name, priv->player_ID.player_name);
|
||||
resident_p->sex = priv->gender;
|
||||
resident_p->house_layer = 0;
|
||||
resident_p->house_idx = 0;
|
||||
|
||||
+1501
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -293,7 +293,7 @@ extern void player_select_init(GAME* game) {
|
||||
u8* name = player_select->player_names[i];
|
||||
|
||||
if (mPr_CheckPrivate(private_p) == TRUE) {
|
||||
mPr_CopyPlayerName(name, private_p);
|
||||
mPr_CopyPlayerName(name, private_p->player_ID.player_name);
|
||||
|
||||
if (private_p->exists == FALSE) {
|
||||
mem_copy(name + PLAYER_NAME_LEN, l_gaishutu_str, 10);
|
||||
|
||||
Reference in New Issue
Block a user