m_private OK (#139)

* update m2ctx

* size fixes?

* size fix

* work

* more work

* m_private OK

* fix style

* format

* fix warnings

* format..

1 files changed, 77 insertions, 77 deletions

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index e17ecdc..d37c324 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -1465,7 +1465,7 @@ func_8008D12C_jp = 0x8008D12C; // type:func
 func_8008D268_jp = 0x8008D268; // type:func
 func_8008D3A4_jp = 0x8008D3A4; // type:func
 func_8008D574_jp = 0x8008D574; // type:func
-func_8008D6E0_jp = 0x8008D6E0; // type:func
+mFI_GetOtherFruit = 0x8008D6E0; // type:func
 func_8008D7B0_jp = 0x8008D7B0; // type:func
 func_8008D884_jp = 0x8008D884; // type:func
 mFI_GetWaveUtinBlock = 0x8008D928; // type:func
@@ -1652,8 +1652,8 @@ mHS_get_arrange_idx = 0x80094BF4; // type:func
 func_80094C10_jp = 0x80094C10; // type:func
 func_80094C44_jp = 0x80094C44; // type:func
 func_80094CAC_jp = 0x80094CAC; // type:func
-func_80094DD0_jp = 0x80094DD0; // type:func
-func_80094E10_jp = 0x80094E10; // type:func
+mLd_NullCheckLandName = 0x80094DD0; // type:func
+mLd_CheckId = 0x80094E10; // type:func
 mLd_CheckCmpLandName = 0x80094E38; // type:func
 mLd_CheckCmpLand = 0x80094E90; // type:func
 mLd_ClearLandName = 0x80094EE0; // type:func
@@ -1663,7 +1663,7 @@ func_80094F84_jp = 0x80094F84; // type:func
 func_8009504C_jp = 0x8009504C; // type:func
 mLd_GetLandName = 0x800950D8; // type:func
 func_800950E8_jp = 0x800950E8; // type:func
-func_8009519C_jp = 0x8009519C; // type:func
+mLd_PlayerManKindCheckNo = 0x8009519C; // type:func
 mLd_PlayerManKindCheck = 0x800951C0; // type:func
 mLd_CheckThisLand = 0x800951E4; // type:func
 func_80095218_jp = 0x80095218; // type:func
@@ -2184,7 +2184,7 @@ func_800A3304_jp = 0x800A3304; // type:func
 func_800A332C_jp = 0x800A332C; // type:func
 mMsg_Main = 0x800A339C; // type:func
 mMsg_Draw = 0x800A33D8; // type:func
-func_800A3400_jp = 0x800A3400; // type:func
+mMsm_ClearRecord = 0x800A3400; // type:func
 func_800A3420_jp = 0x800A3420; // type:func
 func_800A345C_jp = 0x800A345C; // type:func
 func_800A34E8_jp = 0x800A34E8; // type:func
@@ -2545,7 +2545,7 @@ func_800B1D68_jp = 0x800B1D68; // type:func
 func_800B1D94_jp = 0x800B1D94; // type:func
 func_800B1DE8_jp = 0x800B1DE8; // type:func
 func_800B1E94_jp = 0x800B1E94; // type:func
-func_800B1EB0_jp = 0x800B1EB0; // type:func
+mPlib_change_player_cloth_info_lv2 = 0x800B1EB0; // type:func
 func_800B1EDC_jp = 0x800B1EDC; // type:func
 func_800B1F74_jp = 0x800B1F74; // type:func
 func_800B1F84_jp = 0x800B1F84; // type:func
@@ -2714,85 +2714,85 @@ func_800B7700_jp = 0x800B7700; // type:func
 mPr_ClearPlayerName = 0x800B7780; // type:func
 mPr_CopyPlayerName = 0x800B77A4; // type:func
 mPr_NullCheckPlayerName = 0x800B77C4; // type:func
-func_800B7804_jp = 0x800B7804; // type:func
-func_800B785C_jp = 0x800B785C; // type:func
+mPr_CheckCmpPlayerName = 0x800B7804; // type:func
+mPr_GetPlayerName = 0x800B785C; // type:func
 mPr_NullCheckPersonalID = 0x800B7914; // type:func
 mPr_ClearPersonalID = 0x800B795C; // type:func
-func_800B7998_jp = 0x800B7998; // type:func
+mPr_ClearAnyPersonalID = 0x800B7998; // type:func
 mPr_CopyPersonalID = 0x800B79E0; // type:func
 mPr_CheckCmpPersonalID = 0x800B7A00; // type:func
-func_800B7A94_jp = 0x800B7A94; // type:func
-func_800B7AB0_jp = 0x800B7AB0; // type:func
+mPr_ClearPrivateBirthday = 0x800B7A94; // type:func
+mPr_ClearAnimalMemory = 0x800B7AB0; // type:func
 mPr_ClearPrivateInfo = 0x800B7ADC; // type:func
-func_800B7B8C_jp = 0x800B7B8C; // type:func
-func_800B7BC0_jp = 0x800B7BC0; // type:func
-func_800B7CD0_jp = 0x800B7CD0; // type:func
-func_800B7D50_jp = 0x800B7D50; // type:func
+mPr_GetRandomFace = 0x800B7B8C; // type:func
+mPr_GetRandomOriginalFace = 0x800B7BC0; // type:func
+mPr_GetRandomCloth = 0x800B7CD0; // type:func
+mPr_SetNowPrivateCloth = 0x800B7D50; // type:func
 mPr_InitPrivateInfo = 0x800B7D90; // type:func
-func_800B7F00_jp = 0x800B7F00; // type:func
-func_800B7F48_jp = 0x800B7F48; // type:func
+mPr_InitAnyPrivates = 0x800B7F00; // type:func
+mPr_CopyPrivateInfo = 0x800B7F48; // type:func
 mPr_CheckPrivate = 0x800B7F78; // type:func
-func_800B7FA0_jp = 0x800B7FA0; // type:func
+mPr_CheckCmpPrivate = 0x800B7FA0; // type:func
 mPr_GetPrivateIdx = 0x800B7FD4; // type:func
-func_800B8068_jp = 0x800B8068; // type:func
-func_800B80B4_jp = 0x800B80B4; // type:func
-func_800B8128_jp = 0x800B8128; // type:func
-func_800B81A4_jp = 0x800B81A4; // type:func
-func_800B8204_jp = 0x800B8204; // type:func
-func_800B828C_jp = 0x800B828C; // type:func
-func_800B8318_jp = 0x800B8318; // type:func
-func_800B83D4_jp = 0x800B83D4; // type:func
-func_800B8544_jp = 0x800B8544; // type:func
-func_800B86EC_jp = 0x800B86EC; // type:func
-func_800B88EC_jp = 0x800B88EC; // type:func
-func_800B8A88_jp = 0x800B8A88; // type:func
+mPr_GetPossessionItemIdx = 0x800B8068; // type:func
+mPr_GetPossessionItemIdxWithCond = 0x800B80B4; // type:func
+mPr_GetPossessionItemIdxFGTypeWithCond_cancel = 0x800B8128; // type:func
+mPr_GetPossessionItemIdxItem1Category = 0x800B81A4; // type:func
+mPr_GetPossessionItemIdxItem1CategoryWithCond_cancel = 0x800B8204; // type:func
+mPr_GetPossessionItemIdxKindWithCond = 0x800B828C; // type:func
+mPr_GetPossessionItemSum = 0x800B8318; // type:func
+mPr_GetPossessionItemSumWithCond = 0x800B83D4; // type:func
+mPr_GetPossessionItemSumFGTypeWithCond_cancel = 0x800B8544; // type:func
+mPr_GetPossessionItemSumItemCategoryWithCond_cancel = 0x800B86EC; // type:func
+mPr_SetItemCollectBit = 0x800B88EC; // type:func
+mPr_DummyPresentToTruePresent = 0x800B8A88; // type:func
 mPr_SetPossessionItem = 0x800B8B08; // type:func
-func_800B8B8C_jp = 0x800B8B8C; // type:func
-func_800B8BE4_jp = 0x800B8BE4; // type:func
-func_800B8C10_jp = 0x800B8C10; // type:func
-func_800B8C20_jp = 0x800B8C20; // type:func
-func_800B8C34_jp = 0x800B8C34; // type:func
-func_800B8C9C_jp = 0x800B8C9C; // type:func
-func_800B8D18_jp = 0x800B8D18; // type:func
-func_800B8D3C_jp = 0x800B8D3C; // type:func
-func_800B8D64_jp = 0x800B8D64; // type:func
+mPr_SetFreePossessionItem = 0x800B8B8C; // type:func
+mPr_AddFirstJobHint = 0x800B8BE4; // type:func
+mPr_GetFirstJobHintTime = 0x800B8C10; // type:func
+mPr_CheckFirstJobHint = 0x800B8C20; // type:func
+mPr_GetMoneyPower = 0x800B8C34; // type:func
+mPr_GetGoodsPower = 0x800B8C9C; // type:func
+mPr_CheckMuseumAddress = 0x800B8D18; // type:func
+mPr_CheckMuseumInfoMail = 0x800B8D3C; // type:func
+mPr_LoadPak_and_SetPrivateInfo2 = 0x800B8D64; // type:func
 mPr_ClearMotherMailInfo = 0x800B8EE4; // type:func
-func_800B8F20_jp = 0x800B8F20; // type:func
-func_800B8FB8_jp = 0x800B8FB8; // type:func
-func_800B9038_jp = 0x800B9038; // type:func
-func_800B9170_jp = 0x800B9170; // type:func
-func_800B9350_jp = 0x800B9350; // type:func
-func_800B93AC_jp = 0x800B93AC; // type:func
-func_800B947C_jp = 0x800B947C; // type:func
-func_800B94E0_jp = 0x800B94E0; // type:func
-func_800B9704_jp = 0x800B9704; // type:func
-func_800B9790_jp = 0x800B9790; // type:func
-func_800B97C8_jp = 0x800B97C8; // type:func
-func_800B97F8_jp = 0x800B97F8; // type:func
-func_800B996C_jp = 0x800B996C; // type:func
-func_800B9AF0_jp = 0x800B9AF0; // type:func
-func_800B9B2C_jp = 0x800B9B2C; // type:func
-func_800B9C34_jp = 0x800B9C34; // type:func
+mPr_GetMotherMailPaperType = 0x800B8F20; // type:func
+mPr_GetMotherMail = 0x800B8FB8; // type:func
+mPr_SendMotherMailPost = 0x800B9038; // type:func
+mPr_SendMotherMailDate = 0x800B9170; // type:func
+mPr_CheckMotherMailMonthly = 0x800B9350; // type:func
+mPr_GetMotherMailMonthlyNotSendNum = 0x800B93AC; // type:func
+mPr_SetMotherMailMonthly = 0x800B947C; // type:func
+mPr_GetMotherMailMonthlyData = 0x800B94E0; // type:func
+mPr_GetMotherMailNormalNotSendNum = 0x800B9704; // type:func
+mPr_SetMotherMailNormal = 0x800B9790; // type:func
+mPr_CheckMotherMailNormal = 0x800B97C8; // type:func
+mPr_GetMotherMailNormalData = 0x800B97F8; // type:func
+mPr_SendMotherMailNormal = 0x800B996C; // type:func
+mPr_SendMotherMail = 0x800B9AF0; // type:func
+mPr_SendMailFromMother = 0x800B9B2C; // type:func
+mPr_GetForeingerAnimalMail = 0x800B9C34; // type:func
 mPr_SendForeingerAnimalMail = 0x800B9DAC; // type:func
 mPr_StartSetCompleteTalkInfo = 0x800B9E44; // type:func
-func_800B9E90_jp = 0x800B9E90; // type:func
-func_800B9EB4_jp = 0x800B9EB4; // type:func
-func_800B9ED4_jp = 0x800B9ED4; // type:func
-func_800B9F00_jp = 0x800B9F00; // type:func
-func_800B9F74_jp = 0x800B9F74; // type:func
-func_800B9FA0_jp = 0x800B9FA0; // type:func
-func_800BA014_jp = 0x800BA014; // type:func
-func_800BA054_jp = 0x800BA054; // type:func
-func_800BA09C_jp = 0x800BA09C; // type:func
-func_800BA0E4_jp = 0x800BA0E4; // type:func
-func_800BA130_jp = 0x800BA130; // type:func
-func_800BA150_jp = 0x800BA150; // type:func
-func_800BA18C_jp = 0x800BA18C; // type:func
-func_800BA214_jp = 0x800BA214; // type:func
-func_800BA2B0_jp = 0x800BA2B0; // type:func
-func_800BA2D4_jp = 0x800BA2D4; // type:func
-func_800BA344_jp = 0x800BA344; // type:func
-func_800BA3D0_jp = 0x800BA3D0; // type:func
+mPr_SetCompleteTalk = 0x800B9E90; // type:func
+mPr_GetCompleteTalk = 0x800B9EB4; // type:func
+mPr_SetFishCompleteTalk = 0x800B9ED4; // type:func
+mPr_CheckFishCompleteTalk = 0x800B9F00; // type:func
+mPr_SetInsectCompleteTalk = 0x800B9F74; // type:func
+mPr_CheckInsectCompleteTalk = 0x800B9FA0; // type:func
+mPr_GetTalkPermission = 0x800BA014; // type:func
+mPr_GetFishCompTalkPermission = 0x800BA054; // type:func
+mPr_GetInsectCompTalkPermission = 0x800BA09C; // type:func
+mPr_ClearMapInfo = 0x800BA0E4; // type:func
+mPr_CopyMapInfo = 0x800BA130; // type:func
+mPr_SetMapThisLand = 0x800BA150; // type:func
+mPr_GetMapFreeIdx = 0x800BA18C; // type:func
+mPr_GetLandMapIdx = 0x800BA214; // type:func
+mPr_GetThisLandMapIdx = 0x800BA2B0; // type:func
+mPr_PushMapInfo = 0x800BA2D4; // type:func
+mPr_SetNewMap = 0x800BA344; // type:func
+mPr_SetUseMap = 0x800BA3D0; // type:func
 mPr_RenewalMapInfo = 0x800BA404; // type:func
 mPr_RandomSetPlayerData_title_demo = 0x800BA494; // type:func
 mPr_PrintMapInfo_debug = 0x800BA50C; // type:func
@@ -2926,7 +2926,7 @@ func_800BED5C_jp = 0x800BED5C; // type:func
 func_800BEE50_jp = 0x800BEE50; // type:func
 func_800BEEB4_jp = 0x800BEEB4; // type:func
 func_800BEEC4_jp = 0x800BEEC4; // type:func
-func_800BEFCC_jp = 0x800BEFCC; // type:func
+mRmTp_Item1ItemNo2FtrItemNo_AtPlayerRoom = 0x800BEFCC; // type:func
 func_800BF10C_jp = 0x800BF10C; // type:func
 func_800BF230_jp = 0x800BF230; // type:func
 func_800BF26C_jp = 0x800BF26C; // type:func
@@ -3181,7 +3181,7 @@ func_800CA230_jp = 0x800CA230; // type:func
 func_800CA240_jp = 0x800CA240; // type:func
 func_800CA278_jp = 0x800CA278; // type:func
 func_800CA2A8_jp = 0x800CA2A8; // type:func
-func_800CA2BC_jp = 0x800CA2BC; // type:func
+mTM_set_renew_time = 0x800CA2BC; // type:func
 mTM_renewal_renew_time = 0x800CA2DC; // type:func
 func_800CA350_jp = 0x800CA350; // type:func
 func_800CA570_jp = 0x800CA570; // type:func
@@ -6124,8 +6124,8 @@ Player_actor_draw_func = 0x8014390C; //
 B_80143910_jp = 0x80143910; //
 B_80143960_jp = 0x80143960; // type:s8
 B_8014399C_jp = 0x8014399C; // type:s16
-B_801439A0_jp = 0x801439A0; //
-B_80144570_jp = 0x80144570; //
+g_foreigner_private = 0x801439A0; //
+l_mpr_mail = 0x80144570; // size = 0xA4
 B_80144620_jp = 0x80144620; // type:s16
 B_80144624_jp = 0x80144624; //
 B_80144628_jp = 0x80144628; //