The NPC PR 3/3 OK (#119)

* npc werk

* atleast it builds

* m_npc OK

* forgor format

* review

* format

* fix warns?

1 files changed, 226 insertions, 231 deletions

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index b520657..f1094f8 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -1201,7 +1201,7 @@ func_800829D4_jp = 0x800829D4; // type:func
 func_80082B4C_jp = 0x80082B4C; // type:func
 func_80082BD8_jp = 0x80082BD8; // type:func
 func_80082C30_jp = 0x80082C30; // type:func
-func_80082CC8_jp = 0x80082CC8; // type:func
+mEvNM_CheckJointEvent = 0x80082CC8; // type:func
 func_80082DA0_jp = 0x80082DA0; // type:func
 func_80082E40_jp = 0x80082E40; // type:func
 func_80082FA0_jp = 0x80082FA0; // type:func
@@ -1251,7 +1251,7 @@ func_80084CA4_jp = 0x80084CA4; // type:func
 func_80084CD8_jp = 0x80084CD8; // type:func
 func_80084D08_jp = 0x80084D08; // type:func
 func_80084DA4_jp = 0x80084DA4; // type:func
-func_80084DE0_jp = 0x80084DE0; // type:func
+mFAs_GetFieldRank = 0x80084DE0; // type:func
 mFAs_PrintFieldAssessment = 0x80084DF0; // type:func
 func_80084ED0_jp = 0x80084ED0; // type:func
 func_80084FAC_jp = 0x80084FAC; // type:func
@@ -1294,10 +1294,10 @@ func_8008775C_jp = 0x8008775C; // type:func
 func_80087788_jp = 0x80087788; // type:func
 func_800877CC_jp = 0x800877CC; // type:func
 mFM_RenewalReserve = 0x800878D4; // type:func
-func_800879B0_jp = 0x800879B0; // type:func
+mFM_GetReseveName = 0x800879B0; // type:func
 func_80087C30_jp = 0x80087C30; // type:func
 func_80087C40_jp = 0x80087C40; // type:func
-func_80087C64_jp = 0x80087C64; // type:func
+mFI_GetBlockTopP = 0x80087C64; // type:func
 mFI_GetFieldId = 0x80087C88; // type:func
 func_80087C9C_jp = 0x80087C9C; // type:func
 func_80087D30_jp = 0x80087D30; // type:func
@@ -1319,14 +1319,14 @@ func_80088458_jp = 0x80088458; // type:func
 func_800884E0_jp = 0x800884E0; // type:func
 func_800885A8_jp = 0x800885A8; // type:func
 mFI_Wpos2BlockNum = 0x80088710; // type:func
-func_80088780_jp = 0x80088780; // type:func
+mFI_Wpos2BkandUtNuminBlock = 0x80088780; // type:func
 func_8008883C_jp = 0x8008883C; // type:func
 func_800888AC_jp = 0x800888AC; // type:func
 func_80088938_jp = 0x80088938; // type:func
 func_800889D8_jp = 0x800889D8; // type:func
 func_80088A58_jp = 0x80088A58; // type:func
 func_80088B3C_jp = 0x80088B3C; // type:func
-func_80088BC0_jp = 0x80088BC0; // type:func
+mFI_UtNum2PosXZInBk = 0x80088BC0; // type:func
 func_80088BFC_jp = 0x80088BFC; // type:func
 func_80088C74_jp = 0x80088C74; // type:func
 func_80088CBC_jp = 0x80088CBC; // type:func
@@ -1353,7 +1353,7 @@ func_800893C8_jp = 0x800893C8; // type:func
 func_80089404_jp = 0x80089404; // type:func
 mFI_BlockKind2BkNum = 0x80089440; // type:func
 func_800894D0_jp = 0x800894D0; // type:func
-func_80089538_jp = 0x80089538; // type:func
+mFI_GetBkNum2ColTop = 0x80089538; // type:func
 func_800895B8_jp = 0x800895B8; // type:func
 func_80089698_jp = 0x80089698; // type:func
 func_80089704_jp = 0x80089704; // type:func
@@ -1372,7 +1372,7 @@ func_80089D6C_jp = 0x80089D6C; // type:func
 func_80089E84_jp = 0x80089E84; // type:func
 func_80089EF8_jp = 0x80089EF8; // type:func
 func_8008A000_jp = 0x8008A000; // type:func
-func_8008A33C_jp = 0x8008A33C; // type:func
+mFI_BkNumtoUtFGTop = 0x8008A33C; // type:func
 func_8008A3BC_jp = 0x8008A3BC; // type:func
 func_8008A410_jp = 0x8008A410; // type:func
 func_8008A4F8_jp = 0x8008A4F8; // type:func
@@ -1412,9 +1412,9 @@ func_8008BA74_jp = 0x8008BA74; // type:func
 func_8008BAEC_jp = 0x8008BAEC; // type:func
 func_8008BB64_jp = 0x8008BB64; // type:func
 func_8008BBF0_jp = 0x8008BBF0; // type:func
-func_8008BC64_jp = 0x8008BC64; // type:func
+mFI_SetMoveActorBitData_ON = 0x8008BC64; // type:func
 func_8008BCFC_jp = 0x8008BCFC; // type:func
-func_8008BD98_jp = 0x8008BD98; // type:func
+mFI_MyMoveActorBitData_ON = 0x8008BD98; // type:func
 func_8008BDCC_jp = 0x8008BDCC; // type:func
 func_8008BE00_jp = 0x8008BE00; // type:func
 func_8008BE38_jp = 0x8008BE38; // type:func
@@ -1424,14 +1424,14 @@ func_8008C058_jp = 0x8008C058; // type:func
 mFI_CheckPlayerWade = 0x8008C0FC; // type:func
 func_8008C120_jp = 0x8008C120; // type:func
 func_8008C130_jp = 0x8008C130; // type:func
-func_8008C1E0_jp = 0x8008C1E0; // type:func
+mFI_GetDepositP = 0x8008C1E0; // type:func
 func_8008C344_jp = 0x8008C344; // type:func
 func_8008C390_jp = 0x8008C390; // type:func
 func_8008C3B0_jp = 0x8008C3B0; // type:func
 func_8008C3D4_jp = 0x8008C3D4; // type:func
 func_8008C3E8_jp = 0x8008C3E8; // type:func
 func_8008C458_jp = 0x8008C458; // type:func
-func_8008C478_jp = 0x8008C478; // type:func
+mFI_BlockDepositOFF = 0x8008C478; // type:func
 func_8008C498_jp = 0x8008C498; // type:func
 func_8008C4B8_jp = 0x8008C4B8; // type:func
 func_8008C504_jp = 0x8008C504; // type:func
@@ -1595,7 +1595,7 @@ func_80092B8C_jp = 0x80092B8C; // type:func
 func_80092BA0_jp = 0x80092BA0; // type:func
 func_80092BE8_jp = 0x80092BE8; // type:func
 mHsRm_GetHuusuiRoom = 0x80092C2C; // type:func
-func_80092D10_jp = 0x80092D10; // type:func
+mHandbill_Set_free_str = 0x80092D10; // type:func
 func_80092E14_jp = 0x80092E14; // type:func
 func_80092E80_jp = 0x80092E80; // type:func
 func_80092FC4_jp = 0x80092FC4; // type:func
@@ -1629,14 +1629,14 @@ func_800939B8_jp = 0x800939B8; // type:func
 func_80093B28_jp = 0x80093B28; // type:func
 func_80093C98_jp = 0x80093C98; // type:func
 func_80093DA8_jp = 0x80093DA8; // type:func
-func_80093F04_jp = 0x80093F04; // type:func
-func_80093F54_jp = 0x80093F54; // type:func
+mHandbill_Load_HandbillFromRom = 0x80093F04; // type:func
+mHandbill_Load_HandbillFromRom2 = 0x80093F54; // type:func
 func_80093F94_jp = 0x80093F94; // type:func
 func_800940A8_jp = 0x800940A8; // type:func
 func_800941B0_jp = 0x800941B0; // type:func
 func_800942A0_jp = 0x800942A0; // type:func
 func_80094400_jp = 0x80094400; // type:func
-func_800944B8_jp = 0x800944B8; // type:func
+mHandbillz_load = 0x800944B8; // type:func
 func_80094520_jp = 0x80094520; // type:func
 func_80094690_jp = 0x80094690; // type:func
 mHm_SetNowHome = 0x800946D0; // type:func
@@ -1654,18 +1654,18 @@ func_80094C44_jp = 0x80094C44; // type:func
 func_80094CAC_jp = 0x80094CAC; // type:func
 func_80094DD0_jp = 0x80094DD0; // type:func
 func_80094E10_jp = 0x80094E10; // type:func
-func_80094E38_jp = 0x80094E38; // type:func
-func_80094E90_jp = 0x80094E90; // type:func
-func_80094EE0_jp = 0x80094EE0; // type:func
+mLd_CheckCmpLandName = 0x80094E38; // type:func
+mLd_CheckCmpLand = 0x80094E90; // type:func
+mLd_ClearLandName = 0x80094EE0; // type:func
 mLd_CopyLandName = 0x80094F04; // type:func
 func_80094F24_jp = 0x80094F24; // type:func
 func_80094F84_jp = 0x80094F84; // type:func
 func_8009504C_jp = 0x8009504C; // type:func
-func_800950D8_jp = 0x800950D8; // type:func
+mLd_GetLandName = 0x800950D8; // type:func
 func_800950E8_jp = 0x800950E8; // type:func
 func_8009519C_jp = 0x8009519C; // type:func
 mLd_PlayerManKindCheck = 0x800951C0; // type:func
-func_800951E4_jp = 0x800951E4; // type:func
+mLd_CheckThisLand = 0x800951E4; // type:func
 func_80095218_jp = 0x80095218; // type:func
 mLd_LandDataInit = 0x8009524C; // type:func
 func_80095280_jp = 0x80095280; // type:func
@@ -1703,7 +1703,7 @@ func_800965F4_jp = 0x800965F4; // type:func
 func_800966D8_jp = 0x800966D8; // type:func
 func_800966E0_jp = 0x800966E0; // type:func
 func_80096710_jp = 0x80096710; // type:func
-func_80096740_jp = 0x80096740; // type:func
+mIN_copy_name_str = 0x80096740; // type:func
 func_80096860_jp = 0x80096860; // type:func
 func_800968C0_jp = 0x800968C0; // type:func
 func_80096B2C_jp = 0x80096B2C; // type:func
@@ -1885,7 +1885,7 @@ mMl_get_npcinfo_from_mail_name = 0x8009C780; // type:func
 mMl_hunt_for_send_address = 0x8009C80C; // type:func
 mMl_check_send_mail = 0x8009C89C; // type:func
 mMl_check_set_present_myself = 0x8009C8C0; // type:func
-func_8009C900_jp = 0x8009C900; // type:func
+mMC_get_mail_hit_rate = 0x8009C900; // type:func
 func_8009C9F0_jp = 0x8009C9F0; // type:func
 func_8009CA54_jp = 0x8009CA54; // type:func
 func_8009CA94_jp = 0x8009CA94; // type:func
@@ -2242,43 +2242,43 @@ func_800A63F8_jp = 0x800A63F8; // type:func
 func_800A6450_jp = 0x800A6450; // type:func
 func_800A6548_jp = 0x800A6548; // type:func
 func_800A65C4_jp = 0x800A65C4; // type:func
-func_800A6810_jp = 0x800A6810; // type:func
-func_800A6920_jp = 0x800A6920; // type:func
-func_800A6940_jp = 0x800A6940; // type:func
-func_800A695C_jp = 0x800A695C; // type:func
+mNpc_MakeRandTable = 0x800A6810; // type:func
+mNpc_ClearBufSpace1 = 0x800A6920; // type:func
+mNpc_AddNowNpcMax = 0x800A6940; // type:func
+mNpc_SubNowNpcMax = 0x800A695C; // type:func
 mNpc_ClearAnimalPersonalID = 0x800A6978; // type:func
 mNpc_CheckFreeAnimalPersonalID = 0x800A69C8; // type:func
 mNpc_CopyAnimalPersonalID = 0x800A6A04; // type:func
 mNpc_CheckCmpAnimalPersonalID = 0x800A6A6C; // type:func
-func_800A6AF0_jp = 0x800A6AF0; // type:func
-func_800A6B58_jp = 0x800A6B58; // type:func
-func_800A6B6C_jp = 0x800A6B6C; // type:func
-func_800A6B7C_jp = 0x800A6B7C; // type:func
-func_800A6B9C_jp = 0x800A6B9C; // type:func
-func_800A6BC8_jp = 0x800A6BC8; // type:func
-func_800A6C1C_jp = 0x800A6C1C; // type:func
-func_800A6C84_jp = 0x800A6C84; // type:func
-func_800A6CE4_jp = 0x800A6CE4; // type:func
-func_800A6D04_jp = 0x800A6D04; // type:func
-func_800A6DB0_jp = 0x800A6DB0; // type:func
-func_800A6DD0_jp = 0x800A6DD0; // type:func
-func_800A6E0C_jp = 0x800A6E0C; // type:func
+mNpc_GetAnimalNum = 0x800A6AF0; // type:func
+mNpc_CheckRemoveExp = 0x800A6B58; // type:func
+mNpc_GetRemoveTime = 0x800A6B6C; // type:func
+mNpc_AddRemoveTime = 0x800A6B7C; // type:func
+mNpc_SetRemoveExp = 0x800A6B9C; // type:func
+mNpc_SetParentName = 0x800A6BC8; // type:func
+mNpc_SetParentNameAllAnimal = 0x800A6C1C; // type:func
+mNpc_ClearAnimalMail = 0x800A6C84; // type:func
+mNpc_CopyAnimalMail = 0x800A6CE4; // type:func
+mNpc_ClearAnimalMemory = 0x800A6D04; // type:func
+mNpc_CopyAnimalMemory = 0x800A6DB0; // type:func
+mNpc_AddFriendship = 0x800A6DD0; // type:func
+mNpc_CheckFreeAnimalMemory = 0x800A6E0C; // type:func
 mNpc_RenewalAnimalMemory = 0x800A6E40; // type:func
-func_800A6F48_jp = 0x800A6F48; // type:func
-func_800A6FF4_jp = 0x800A6FF4; // type:func
-func_800A706C_jp = 0x800A706C; // type:func
-func_800A71AC_jp = 0x800A71AC; // type:func
-func_800A71F8_jp = 0x800A71F8; // type:func
-func_800A7238_jp = 0x800A7238; // type:func
-func_800A72C0_jp = 0x800A72C0; // type:func
-func_800A73D8_jp = 0x800A73D8; // type:func
-func_800A74A0_jp = 0x800A74A0; // type:func
-func_800A7530_jp = 0x800A7530; // type:func
-func_800A75FC_jp = 0x800A75FC; // type:func
-func_800A76E4_jp = 0x800A76E4; // type:func
-func_800A77F0_jp = 0x800A77F0; // type:func
-func_800A7858_jp = 0x800A7858; // type:func
-func_800A78DC_jp = 0x800A78DC; // type:func
+mNpc_GetOldAnimalMemoryIdx = 0x800A6F48; // type:func
+mNpc_GetFreeAnimalMemoryIdx = 0x800A6FF4; // type:func
+mNpc_ForceGetFreeAnimalMemoryIdx = 0x800A706C; // type:func
+mNpc_SetAnimalMemory_NotSetDay = 0x800A71AC; // type:func
+mNpc_SetAnimalMemory = 0x800A71F8; // type:func
+mNpc_GetAnimalMemoryIdx = 0x800A7238; // type:func
+mNpc_SetAnimalLastTalk = 0x800A72C0; // type:func
+mNpc_SetAnimalPersonalID2Memory = 0x800A73D8; // type:func
+mNpc_GetHighestFriendshipIdx = 0x800A74A0; // type:func
+mNpc_SelectBestFriend = 0x800A7530; // type:func
+mNpc_GetAnimalMemoryBestFriend = 0x800A75FC; // type:func
+mNpc_GetAnimalMemoryFriend_Land_Sex = 0x800A76E4; // type:func
+mNpc_GetAnimalMemoryNum = 0x800A77F0; // type:func
+mNpc_GetAnimalMemoryLetterNum = 0x800A7858; // type:func
+mNpc_GetAnimalMemoryLandKindNum = 0x800A78DC; // type:func
 mNpc_ClearAnimalInfo = 0x800A7A04; // type:func
 mNpc_ClearAnyAnimalInfo = 0x800A7A9C; // type:func
 mNpc_CheckFreeAnimalInfo = 0x800A7AEC; // type:func
@@ -2286,155 +2286,155 @@ mNpc_GetFreeAnimalInfo = 0x800A7B34; // type:func
 mNpc_UseFreeAnimalInfo = 0x800A7BAC; // type:func
 mNpc_CopyAnimalInfo = 0x800A7C10; // type:func
 mNpc_SearchAnimalinfo = 0x800A7C30; // type:func
-func_800A7C94_jp = 0x800A7C94; // type:func
-func_800A7D08_jp = 0x800A7D08; // type:func
-func_800A7DA0_jp = 0x800A7DA0; // type:func
+mNpc_GetAnimalInfoP = 0x800A7C94; // type:func
+mNpc_SearchAnimalPersonalID = 0x800A7D08; // type:func
+mNpc_GetOtherAnimalPersonalIDOtherBlock = 0x800A7DA0; // type:func
 mNpc_GetOtherAnimalPersonalID = 0x800A80B0; // type:func
-func_800A80D8_jp = 0x800A80D8; // type:func
-func_800A8148_jp = 0x800A8148; // type:func
-func_800A820C_jp = 0x800A820C; // type:func
-func_800A82C8_jp = 0x800A82C8; // type:func
-func_800A8344_jp = 0x800A8344; // type:func
-func_800A83F0_jp = 0x800A83F0; // type:func
-func_800A845C_jp = 0x800A845C; // type:func
-func_800A8614_jp = 0x800A8614; // type:func
-func_800A86C4_jp = 0x800A86C4; // type:func
-func_800A86E8_jp = 0x800A86E8; // type:func
-func_800A8764_jp = 0x800A8764; // type:func
-func_800A8814_jp = 0x800A8814; // type:func
-func_800A8868_jp = 0x800A8868; // type:func
-func_800A8AB4_jp = 0x800A8AB4; // type:func
-func_800A8B10_jp = 0x800A8B10; // type:func
-func_800A8B84_jp = 0x800A8B84; // type:func
-func_800A8C48_jp = 0x800A8C48; // type:func
-func_800A8DB4_jp = 0x800A8DB4; // type:func
-func_800A8F30_jp = 0x800A8F30; // type:func
-func_800A9028_jp = 0x800A9028; // type:func
-func_800A9110_jp = 0x800A9110; // type:func
-func_800A918C_jp = 0x800A918C; // type:func
-func_800A91DC_jp = 0x800A91DC; // type:func
-func_800A9364_jp = 0x800A9364; // type:func
-func_800A93AC_jp = 0x800A93AC; // type:func
-func_800A9468_jp = 0x800A9468; // type:func
-func_800A94C8_jp = 0x800A94C8; // type:func
-func_800A956C_jp = 0x800A956C; // type:func
-func_800A96B0_jp = 0x800A96B0; // type:func
-func_800A9780_jp = 0x800A9780; // type:func
-func_800A992C_jp = 0x800A992C; // type:func
-func_800A99B8_jp = 0x800A99B8; // type:func
-func_800A9A98_jp = 0x800A9A98; // type:func
-func_800A9BC4_jp = 0x800A9BC4; // type:func
-func_800A9BD4_jp = 0x800A9BD4; // type:func
-func_800A9CD4_jp = 0x800A9CD4; // type:func
-func_800A9D68_jp = 0x800A9D68; // type:func
-func_800A9E54_jp = 0x800A9E54; // type:func
-func_800A9E7C_jp = 0x800A9E7C; // type:func
-func_800A9EC8_jp = 0x800A9EC8; // type:func
-func_800A9F9C_jp = 0x800A9F9C; // type:func
-func_800AA028_jp = 0x800AA028; // type:func
-func_800AA0B8_jp = 0x800AA0B8; // type:func
-func_800AA124_jp = 0x800AA124; // type:func
-func_800AA14C_jp = 0x800AA14C; // type:func
+mNpc_SetAnimalThisLand = 0x800A80D8; // type:func
+mNpc_GetSameLooksNum = 0x800A8148; // type:func
+mNpc_CheckNpcExistBlock = 0x800A820C; // type:func
+mNpc_Mail2AnimalMail = 0x800A82C8; // type:func
+mNpc_AnimalMail2Mail = 0x800A8344; // type:func
+mNpc_CheckMailChar = 0x800A83F0; // type:func
+mNpc_CheckNormalMail_sub = 0x800A845C; // type:func
+mNpc_CheckNormalMail_length = 0x800A8614; // type:func
+mNpc_CheckNormalMail = 0x800A86C4; // type:func
+mNpc_SetMailCondThisLand = 0x800A86E8; // type:func
+mNpc_SetMailCondOtherLand = 0x800A8764; // type:func
+mNpc_SetRemailCond = 0x800A8814; // type:func
+mNpc_SendMailtoNpc = 0x800A8868; // type:func
+mNpc_ClearRemail = 0x800A8AB4; // type:func
+mNpc_GetRemailPresent = 0x800A8B10; // type:func
+mNpc_GetHandbillz = 0x800A8B84; // type:func
+mNpc_SetRemailFreeString = 0x800A8C48; // type:func
+mNpc_GetRemailGoodData = 0x800A8DB4; // type:func
+mNpc_GetRemailWrongData = 0x800A8F30; // type:func
+mNpc_GetRemailData = 0x800A9028; // type:func
+mNpc_SendRemailPostOffice = 0x800A9110; // type:func
+mNpc_CheckLetterTime = 0x800A918C; // type:func
+mNpc_Remail = 0x800A91DC; // type:func
+mNpc_GetPaperType = 0x800A9364; // type:func
+mNpc_LoadMailDataCommon2 = 0x800A93AC; // type:func
+mNpc_GetEventPresent = 0x800A9468; // type:func
+mNpc_GetEventMail = 0x800A94C8; // type:func
+mNpc_SendEventPresentMail = 0x800A956C; // type:func
+mNpc_SendEventPresentMailSex = 0x800A96B0; // type:func
+mNpc_SendEventPresentMail_common = 0x800A9780; // type:func
+mNpc_GetBirthdayPresent = 0x800A992C; // type:func
+mNpc_GetBirthdayCard = 0x800A99B8; // type:func
+mNpc_SendBirthdayCard = 0x800A9A98; // type:func
+mNpc_SendEventBirthdayCard = 0x800A9BC4; // type:func
+mNpc_SendEventBirthdayCard2 = 0x800A9BD4; // type:func
+mNpc_GetXmasCardData = 0x800A9CD4; // type:func
+mNpc_SendEventXmasCard = 0x800A9D68; // type:func
+mNpc_SetWordEnding = 0x800A9E54; // type:func
+mNpc_GetWordEnding = 0x800A9E7C; // type:func
+mNpc_ResetWordEnding = 0x800A9EC8; // type:func
+mNpc_GetFreeEventNpcIdx = 0x800A9F9C; // type:func
+mNpc_RegistEventNpc = 0x800AA028; // type:func
+mNpc_UnRegistEventNpc = 0x800AA0B8; // type:func
+mNpc_ClearEventNpc = 0x800AA124; // type:func
+mNpc_GetSameEventNpc = 0x800AA14C; // type:func
 mNpc_GetLooks = 0x800AA1E0; // type:func
-func_800AA218_jp = 0x800AA218; // type:func
-func_800AA29C_jp = 0x800AA29C; // type:func
-func_800AA2F8_jp = 0x800AA2F8; // type:func
-func_800AA35C_jp = 0x800AA35C; // type:func
-func_800AA3A4_jp = 0x800AA3A4; // type:func
-func_800AA438_jp = 0x800AA438; // type:func
-func_800AA49C_jp = 0x800AA49C; // type:func
-func_800AA4FC_jp = 0x800AA4FC; // type:func
-func_800AA51C_jp = 0x800AA51C; // type:func
+mNpc_SetDefAnimalInfo = 0x800AA218; // type:func
+mNpc_SetDefAnimal = 0x800AA29C; // type:func
+mNpc_SetHaveAppeared = 0x800AA2F8; // type:func
+mNpc_GetHaveAppeared_idx = 0x800AA35C; // type:func
+mNpc_GetLooks2NotHaveAppearedNum = 0x800AA3A4; // type:func
+mNpc_ResetHaveAppeared_common = 0x800AA438; // type:func
+mNpc_ResetHaveAppeared = 0x800AA49C; // type:func
+mNpc_GetDefGrowPermission = 0x800AA4FC; // type:func
+mNpc_DecideLivingNpcMax = 0x800AA51C; // type:func
 mNpc_SetAnimalTitleDemo = 0x800AA790; // type:func
-func_800AA8C4_jp = 0x800AA8C4; // type:func
-func_800AA9F4_jp = 0x800AA9F4; // type:func
-func_800AAA40_jp = 0x800AAA40; // type:func
-func_800AAB48_jp = 0x800AAB48; // type:func
-func_800AAC88_jp = 0x800AAC88; // type:func
-func_800AADE8_jp = 0x800AADE8; // type:func
-func_800AAEFC_jp = 0x800AAEFC; // type:func
-func_800AB054_jp = 0x800AB054; // type:func
-func_800AB09C_jp = 0x800AB09C; // type:func
+mNpc_GetReservedUtNum = 0x800AA8C4; // type:func
+mNpc_BlockNum2ReservedUtNum = 0x800AA9F4; // type:func
+mNpc_MakeReservedListBeforeFieldct = 0x800AAA40; // type:func
+mNpc_MakeReservedListAfterFieldct = 0x800AAB48; // type:func
+mNpc_BuildHouseBeforeFieldct = 0x800AAC88; // type:func
+mNpc_DestroyHouse = 0x800AADE8; // type:func
+mNpc_SetNpcHome = 0x800AAEFC; // type:func
+mNpc_InitNpcData = 0x800AB054; // type:func
+mNpc_InitNpcList = 0x800AB09C; // type:func
 mNpc_SetNpcList = 0x800AB134; // type:func
 mNpc_SetNpcinfo = 0x800AB3A0; // type:func
-func_800AB498_jp = 0x800AB498; // type:func
-func_800AB62C_jp = 0x800AB62C; // type:func
-func_800AB6C8_jp = 0x800AB6C8; // type:func
-func_800AB734_jp = 0x800AB734; // type:func
-func_800AB7D0_jp = 0x800AB7D0; // type:func
-func_800AB80C_jp = 0x800AB80C; // type:func
+mNpc_AddNpc_inNpcRoom = 0x800AB498; // type:func
+mNpc_RenewalNpcRoom = 0x800AB62C; // type:func
+mNpc_RenewalSetNpc = 0x800AB6C8; // type:func
+mNpc_GetFriendAnimalNum = 0x800AB734; // type:func
+mNpc_CheckFriendAllAnimal = 0x800AB7D0; // type:func
+mNpc_CheckSelectFurniture = 0x800AB80C; // type:func
 func_800AB8A0_jp = 0x800AB8A0; // type:func
-func_800ABA14_jp = 0x800ABA14; // type:func
-func_800ABAA8_jp = 0x800ABAA8; // type:func
-func_800ABAF0_jp = 0x800ABAF0; // type:func
+mNpc_SetNpcFurnitureRandom = 0x800ABA14; // type:func
+mNpc_GetNpcFurniture = 0x800ABAA8; // type:func
+mNpc_ClearInAnimal = 0x800ABAF0; // type:func
 mNpc_GetInAnimalP = 0x800ABB14; // type:func
-func_800ABB24_jp = 0x800ABB24; // type:func
-func_800ABCF8_jp = 0x800ABCF8; // type:func
+mNpc_DecideRemoveAnimalNo_Friend = 0x800ABB24; // type:func
+mNpc_DecideRemoveAnimalNo = 0x800ABCF8; // type:func
 mNpc_SetRemoveAnimalNo = 0x800ABD90; // type:func
-func_800ABE30_jp = 0x800ABE30; // type:func
-func_800ABF40_jp = 0x800ABF40; // type:func
-func_800AC1A0_jp = 0x800AC1A0; // type:func
-func_800AC1C8_jp = 0x800AC1C8; // type:func
-func_800AC1EC_jp = 0x800AC1EC; // type:func
-func_800AC284_jp = 0x800AC284; // type:func
-func_800AC358_jp = 0x800AC358; // type:func
-func_800AC488_jp = 0x800AC488; // type:func
+mNpc_CheckGoodbyAnimalMemoryNum = 0x800ABE30; // type:func
+mNpc_GetGoodbyAnimalIdx = 0x800ABF40; // type:func
+mNpc_ClearGoodbyMail = 0x800AC1A0; // type:func
+mNpc_FirstClearGoodbyMail = 0x800AC1C8; // type:func
+mNpc_SetGoodbyAnimalMail = 0x800AC1EC; // type:func
+mNpc_SetGoodbyMailData = 0x800AC284; // type:func
+mNpc_SendGoodbyAnimalMailOne = 0x800AC358; // type:func
+mNpc_SendGoodbyAnimalMail = 0x800AC488; // type:func
 mNpc_SendRegisteredGoodbyMail = 0x800AC558; // type:func
-func_800AC57C_jp = 0x800AC57C; // type:func
-func_800AC804_jp = 0x800AC804; // type:func
+mNpc_GetRemoveAnimal = 0x800AC57C; // type:func
+mNpc_CheckBuildHouse = 0x800AC804; // type:func
 mNpc_SetReturnAnimal = 0x800AC898; // type:func
-func_800ACB24_jp = 0x800ACB24; // type:func
-func_800ACB54_jp = 0x800ACB54; // type:func
-func_800ACC38_jp = 0x800ACC38; // type:func
-func_800ACCAC_jp = 0x800ACCAC; // type:func
+mNpc_AddActor_inBlock = 0x800ACB24; // type:func
+mNpc_SetNpcNameID = 0x800ACB54; // type:func
+mNpc_LoadNpcNameString = 0x800ACC38; // type:func
+mNpc_GetNpcWorldNameTableNo = 0x800ACCAC; // type:func
 mNpc_GetNpcWorldNameAnm = 0x800ACD18; // type:func
-func_800ACD74_jp = 0x800ACD74; // type:func
-func_800ACDF8_jp = 0x800ACDF8; // type:func
-func_800ACE90_jp = 0x800ACE90; // type:func
+mNpc_GetNpcWorldNameP = 0x800ACD74; // type:func
+mNpc_GetNpcWorldName = 0x800ACDF8; // type:func
+mNpc_GetRandomAnimalName = 0x800ACE90; // type:func
 mNpc_GetAnimalPlateName = 0x800ACF84; // type:func
-func_800AD084_jp = 0x800AD084; // type:func
-func_800AD0B8_jp = 0x800AD0B8; // type:func
-func_800AD104_jp = 0x800AD104; // type:func
-func_800AD154_jp = 0x800AD154; // type:func
-func_800AD188_jp = 0x800AD188; // type:func
-func_800AD1E0_jp = 0x800AD1E0; // type:func
-func_800AD22C_jp = 0x800AD22C; // type:func
-func_800AD2B8_jp = 0x800AD2B8; // type:func
+mNpc_GetNpcLooks = 0x800AD084; // type:func
+mNpc_GetActorSex = 0x800AD0B8; // type:func
+mNpc_GetLooks2Sex = 0x800AD104; // type:func
+mNpc_GetAnimalSex = 0x800AD154; // type:func
+mNpc_GetNpcSex = 0x800AD188; // type:func
+mNpc_GetNpcSoundSpecNotAnimal = 0x800AD1E0; // type:func
+mNpc_GetNpcSoundSpec = 0x800AD22C; // type:func
+mNpc_GetMsg = 0x800AD2B8; // type:func
 mNpc_InitNpcAllInfo = 0x800AD2C4; // type:func
-func_800AD338_jp = 0x800AD338; // type:func
-func_800AD3BC_jp = 0x800AD3BC; // type:func
-func_800AD4B8_jp = 0x800AD4B8; // type:func
-func_800AD614_jp = 0x800AD614; // type:func
-func_800AD6D4_jp = 0x800AD6D4; // type:func
-func_800AD8C4_jp = 0x800AD8C4; // type:func
-func_800AD954_jp = 0x800AD954; // type:func
-func_800AD9FC_jp = 0x800AD9FC; // type:func
-func_800ADBE4_jp = 0x800ADBE4; // type:func
-func_800ADC28_jp = 0x800ADC28; // type:func
-func_800ADC8C_jp = 0x800ADC8C; // type:func
-func_800ADD20_jp = 0x800ADD20; // type:func
-func_800ADEFC_jp = 0x800ADEFC; // type:func
-func_800AE110_jp = 0x800AE110; // type:func
+mNpc_CheckGrowFieldRank = 0x800AD338; // type:func
+mNpc_CheckGrow = 0x800AD3BC; // type:func
+mNpc_GetMinLooks = 0x800AD4B8; // type:func
+mNpc_GetMinSex = 0x800AD614; // type:func
+mNpc_GrowLooksNpcIdx = 0x800AD6D4; // type:func
+mNpc_SetAnimalInfoNpcIdx = 0x800AD8C4; // type:func
+mNpc_SetGrowNpc = 0x800AD954; // type:func
+mNpc_Grow = 0x800AD9FC; // type:func
+mNpc_CheckNpcSet_fgcol = 0x800ADBE4; // type:func
+mNpc_CheckNpcSet_fgcol_hard = 0x800ADC28; // type:func
+mNpc_CheckNpcSet = 0x800ADC8C; // type:func
+mNpc_GetMakeUtNuminBlock_hard_area = 0x800ADD20; // type:func
+mNpc_GetMakeUtNuminBlock_area = 0x800ADEFC; // type:func
+mNpc_GetMakeUtNuminBlock = 0x800AE110; // type:func
 mNpc_ClearTalkInfo = 0x800AE134; // type:func
-func_800AE1A0_jp = 0x800AE1A0; // type:func
-func_800AE1B8_jp = 0x800AE1B8; // type:func
-func_800AE1D8_jp = 0x800AE1D8; // type:func
-func_800AE23C_jp = 0x800AE23C; // type:func
-func_800AE284_jp = 0x800AE284; // type:func
-func_800AE2E8_jp = 0x800AE2E8; // type:func
-func_800AE320_jp = 0x800AE320; // type:func
-func_800AE37C_jp = 0x800AE37C; // type:func
-func_800AE3B4_jp = 0x800AE3B4; // type:func
-func_800AE4B4_jp = 0x800AE4B4; // type:func
-func_800AE558_jp = 0x800AE558; // type:func
-func_800AE5C8_jp = 0x800AE5C8; // type:func
-func_800AE64C_jp = 0x800AE64C; // type:func
-func_800AE670_jp = 0x800AE670; // type:func
-func_800AE694_jp = 0x800AE694; // type:func
-func_800AE6B0_jp = 0x800AE6B0; // type:func
-func_800AE6CC_jp = 0x800AE6CC; // type:func
-func_800AE76C_jp = 0x800AE76C; // type:func
-func_800AE898_jp = 0x800AE898; // type:func
+mNpc_TimerCountDown = 0x800AE1A0; // type:func
+mNpc_SetUnlockTimer = 0x800AE1B8; // type:func
+mNpc_CountTalkNum = 0x800AE1D8; // type:func
+mNpc_CheckOverImpatient = 0x800AE23C; // type:func
+mNpc_GetOverImpatient = 0x800AE284; // type:func
+mNpc_CheckQuestRequest = 0x800AE2E8; // type:func
+mNpc_SetQuestRequestOFF = 0x800AE320; // type:func
+mNpc_UnlockTimerCountDown = 0x800AE37C; // type:func
+mNpc_TalkInfoMove = 0x800AE3B4; // type:func
+mNpc_TalkEndMove = 0x800AE4B4; // type:func
+mNpc_GetNpcFloorNo = 0x800AE558; // type:func
+mNpc_SetTalkBee = 0x800AE5C8; // type:func
+mNpc_GetFishCompleteTalk = 0x800AE64C; // type:func
+mNpc_GetInsectCompleteTalk = 0x800AE670; // type:func
+mNpc_SetFishCompleteTalk = 0x800AE694; // type:func
+mNpc_SetInsectCompleteTalk = 0x800AE6B0; // type:func
+mNpc_SetNpcHomeYpos = 0x800AE6CC; // type:func
+mNpc_PrintRemoveInfo = 0x800AE76C; // type:func
+mNpc_SetTalkAnimalIdx_fdebug = 0x800AE898; // type:func
 mNpc_PrintFriendship_fdebug = 0x800AE8C8; // type:func
 mNPS_get_schedule_area = 0x800AEA80; // type:func
 mNPS_set_schedule_area = 0x800AEB50; // type:func
@@ -2685,9 +2685,9 @@ func_800B66CC_jp = 0x800B66CC; // type:func
 mPB_police_box_init = 0x800B6718; // type:func
 func_800B67C0_jp = 0x800B67C0; // type:func
 func_800B6838_jp = 0x800B6838; // type:func
-func_800B68E8_jp = 0x800B68E8; // type:func
+mPO_get_keep_mail_sum = 0x800B68E8; // type:func
 func_800B690C_jp = 0x800B690C; // type:func
-func_800B6A3C_jp = 0x800B6A3C; // type:func
+mPO_receipt_proc = 0x800B6A3C; // type:func
 func_800B6AC8_jp = 0x800B6AC8; // type:func
 func_800B6B94_jp = 0x800B6B94; // type:func
 func_800B6C14_jp = 0x800B6C14; // type:func
@@ -2711,12 +2711,12 @@ func_800B7560_jp = 0x800B7560; // type:func
 mPO_business_proc = 0x800B7624; // type:func
 func_800B7680_jp = 0x800B7680; // type:func
 func_800B7700_jp = 0x800B7700; // type:func
-func_800B7780_jp = 0x800B7780; // type:func
+mPr_ClearPlayerName = 0x800B7780; // type:func
 mPr_CopyPlayerName = 0x800B77A4; // type:func
-func_800B77C4_jp = 0x800B77C4; // type:func
+mPr_NullCheckPlayerName = 0x800B77C4; // type:func
 func_800B7804_jp = 0x800B7804; // type:func
 func_800B785C_jp = 0x800B785C; // type:func
-func_800B7914_jp = 0x800B7914; // type:func
+mPr_NullCheckPersonalID = 0x800B7914; // type:func
 mPr_ClearPersonalID = 0x800B795C; // type:func
 func_800B7998_jp = 0x800B7998; // type:func
 mPr_CopyPersonalID = 0x800B79E0; // type:func
@@ -2733,7 +2733,7 @@ func_800B7F00_jp = 0x800B7F00; // type:func
 func_800B7F48_jp = 0x800B7F48; // type:func
 mPr_CheckPrivate = 0x800B7F78; // type:func
 func_800B7FA0_jp = 0x800B7FA0; // type:func
-func_800B7FD4_jp = 0x800B7FD4; // 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
@@ -2796,10 +2796,10 @@ func_800BA3D0_jp = 0x800BA3D0; // type:func
 mPr_RenewalMapInfo = 0x800BA404; // type:func
 mPr_RandomSetPlayerData_title_demo = 0x800BA494; // type:func
 mPr_PrintMapInfo_debug = 0x800BA50C; // type:func
-func_800BA660_jp = 0x800BA660; // type:func
+mQst_ClearQuestInfo = 0x800BA660; // type:func
 mQst_ClearDelivery = 0x800BA690; // type:func
 mQst_ClearErrand = 0x800BA6F0; // type:func
-func_800BA778_jp = 0x800BA778; // type:func
+mQst_ClearContest = 0x800BA778; // type:func
 mQst_ClearNotSaveQuest = 0x800BA7C8; // type:func
 func_800BA7E8_jp = 0x800BA7E8; // type:func
 func_800BA8A0_jp = 0x800BA8A0; // type:func
@@ -2819,7 +2819,7 @@ func_800BB10C_jp = 0x800BB10C; // type:func
 func_800BB270_jp = 0x800BB270; // type:func
 func_800BB3A4_jp = 0x800BB3A4; // type:func
 func_800BB4B0_jp = 0x800BB4B0; // type:func
-func_800BB5DC_jp = 0x800BB5DC; // type:func
+mQst_GetOccuredContestIdx = 0x800BB5DC; // type:func
 func_800BB634_jp = 0x800BB634; // type:func
 func_800BB658_jp = 0x800BB658; // type:func
 func_800BB67C_jp = 0x800BB67C; // type:func
@@ -2829,8 +2829,8 @@ func_800BB740_jp = 0x800BB740; // type:func
 func_800BB86C_jp = 0x800BB86C; // type:func
 func_800BB990_jp = 0x800BB990; // type:func
 func_800BBAB0_jp = 0x800BBAB0; // type:func
-func_800BBB30_jp = 0x800BBB30; // type:func
-func_800BBBEC_jp = 0x800BBBEC; // type:func
+mQst_SetReceiveLetter = 0x800BBB30; // type:func
+mQst_GetFirstJobData = 0x800BBBEC; // type:func
 func_800BBCBC_jp = 0x800BBCBC; // type:func
 func_800BBD00_jp = 0x800BBD00; // type:func
 func_800BBD68_jp = 0x800BBD68; // type:func
@@ -2849,7 +2849,7 @@ func_800BC28C_jp = 0x800BC28C; // type:func
 func_800BC33C_jp = 0x800BC33C; // type:func
 func_800BC368_jp = 0x800BC368; // type:func
 func_800BC394_jp = 0x800BC394; // type:func
-func_800BC414_jp = 0x800BC414; // type:func
+mQst_GetRandom = 0x800BC414; // type:func
 func_800BC454_jp = 0x800BC454; // type:func
 func_800BC528_jp = 0x800BC528; // type:func
 func_800BC5D4_jp = 0x800BC5D4; // type:func
@@ -2947,7 +2947,7 @@ func_800BFA78_jp = 0x800BFA78; // type:func
 func_800BFAA8_jp = 0x800BFAA8; // type:func
 func_800BFC00_jp = 0x800BFC00; // type:func
 func_800BFC5C_jp = 0x800BFC5C; // type:func
-func_800BFCF0_jp = 0x800BFCF0; // type:func
+mSP_SelectRandomItem_New = 0x800BFCF0; // type:func
 func_800BFF8C_jp = 0x800BFF8C; // type:func
 func_800BFFC0_jp = 0x800BFFC0; // type:func
 func_800C0194_jp = 0x800C0194; // type:func
@@ -2998,7 +2998,7 @@ func_800C2480_jp = 0x800C2480; // type:func
 func_800C2578_jp = 0x800C2578; // type:func
 func_800C2718_jp = 0x800C2718; // type:func
 func_800C284C_jp = 0x800C284C; // type:func
-func_800C297C_jp = 0x800C297C; // type:func
+mSP_RandomUmbSelect = 0x800C297C; // type:func
 func_800C2AAC_jp = 0x800C2AAC; // type:func
 func_800C2B70_jp = 0x800C2B70; // type:func
 func_800C2CC8_jp = 0x800C2CC8; // type:func
@@ -3025,7 +3025,7 @@ mSDI_StartInitAfter = 0x800C3BCC; // type:func
 mSDI_StartInitBefore = 0x800C3D50; // type:func
 mSDI_StartDataInit = 0x800C3DA8; // type:func
 func_800C3E30_jp = 0x800C3E30; // type:func
-func_800C3F70_jp = 0x800C3F70; // type:func
+mString_Load_StringFromRom = 0x800C3F70; // type:func
 func_800C4084_jp = 0x800C4084; // type:func
 func_800C40F8_jp = 0x800C40F8; // type:func
 func_800C4168_jp = 0x800C4168; // type:func
@@ -3463,7 +3463,7 @@ lbRTC_IsOverTime = 0x800D52C0; // type:func
 lbRTC_IsJustAtRTC = 0x800D53A4; // type:func
 lbRTC_IsOverRTC = 0x800D53DC; // type:func
 lbRTC_IsOverWeekRTC = 0x800D5414; // type:func
-func_800D5480_jp = 0x800D5480; // type:func
+lbRTC_IntervalTime = 0x800D5480; // type:func
 lbRTC_GetIntervalDays = 0x800D54DC; // type:func
 lbRTC_Add_YY = 0x800D56B8; // type:func
 lbRTC_Add_MM = 0x800D56CC; // type:func
@@ -4724,7 +4724,7 @@ D_8010AEE0_jp = 0x8010AEE0; //
 D_8010AEF4_jp = 0x8010AEF4; //
 D_8010AF00_jp = 0x8010AF00; // type:s16
 D_8010AF30_jp = 0x8010AF30; // type:s16
-D_8010AF58_jp = 0x8010AF58; // type:u8
+npc_looks_table = 0x8010AF58; // type:u8
 D_8010B034_jp = 0x8010B034; //
 D_8010B074_jp = 0x8010B074; //
 D_8010B078_jp = 0x8010B078; //
@@ -4751,7 +4751,7 @@ D_8010B4B0_jp = 0x8010B4B0; // type:u16
 D_8010B4FC_jp = 0x8010B4FC; // type:u16
 D_8010B500_jp = 0x8010B500; //
 D_8010B504_jp = 0x8010B504; // type:s16
-D_8010B510_jp = 0x8010B510; // type:u16
+l_sp_actor_name = 0x8010B510; //
 D_8010B810_jp = 0x8010B810; //
 D_8010B818_jp = 0x8010B818; //
 D_8010B81C_jp = 0x8010B81C; //
@@ -6097,29 +6097,24 @@ B_80142BA0_jp = 0x80142BA0; //
 B_80142BBE_jp = 0x80142BBE; //
 B_80142BC0_jp = 0x80142BC0; // type:u8
 B_80142BE0_jp = 0x80142BE0; //
-B_80142C00_jp = 0x80142C00; //
-B_80142CF0_jp = 0x80142CF0; //
-B_80142D08_jp = 0x80142D08; //
-B_80142E38_jp = 0x80142E38; //
-B_80142E58_jp = 0x80142E58; //
-B_80142E78_jp = 0x80142E78; //
-B_80142E80_jp = 0x80142E80; //
-B_80142E98_jp = 0x80142E98; //
-B_80142EB8_jp = 0x80142EB8; //
-B_80142ED8_jp = 0x80142ED8; // type:s8
-B_80142EDA_jp = 0x80142EDA; // type:u8
-B_80142EDB_jp = 0x80142EDB; // type:s8
-B_80142EDC_jp = 0x80142EDC; // type:u16
-B_80142EDE_jp = 0x80142EDE; // type:s16
-B_80142EE0_jp = 0x80142EE0; // type:s8
-B_80142F50_jp = 0x80142F50; //
-B_80142F58_jp = 0x80142F58; //
-B_80142F60_jp = 0x80142F60; //
-B_80142F68_jp = 0x80142F68; //
-B_80142F70_jp = 0x80142F70; //
-B_80142F80_jp = 0x80142F80; //
-B_80143028_jp = 0x80143028; //
-B_80143388_jp = 0x80143388; //
+fake_table = 0x80142C00; //
+Handbillz_tmp_super = 0x80142CF0; //
+reserved = 0x80142D08; //
+Handbillz_tmp_ps = 0x80142E38; //
+candidate_table = 0x80142E58; //
+npc_def_list =  0x80142E78; //
+Remail_tmp_super = 0x80142E80; //
+Remail_tmp_ps = 0x80142E98; //
+fg_flag = 0x80142EB8; //
+l_npc_talk_info = 0x80142ED8; // type:s8
+Event_animal_name = 0x80142F50; //
+Birthday_animal_name = 0x80142F58; //
+Goodby_animal_name = 0x80142F60; //
+load_name = 0x80142F68; //
+l_mnpc_goodby_mail = 0x80142F70; //
+l_npc_mail = 0x80142F80; //
+fakeTable = 0x80143028; //
+l_mnpc_remove_in_animal = 0x80143388; //
 B_801438B0_jp = 0x801438B0; //
 B_801438B8_jp = 0x801438B8; //
 B_801438BC_jp = 0x801438BC; //