diff --git a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump.bytes b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump.bytes deleted file mode 100644 index 92df1555..00000000 Binary files a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump.bytes and /dev/null differ diff --git a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2.bytes b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2.bytes new file mode 100644 index 00000000..c5a915ae Binary files /dev/null and b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2.bytes differ diff --git a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump.bytes.meta b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2.bytes.meta similarity index 75% rename from ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump.bytes.meta rename to ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2.bytes.meta index 94cf1885..31ec2127 100644 --- a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump.bytes.meta +++ b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3559983a4af40bb4998c6417b3a640c6 +guid: 81301a65705377845bf3dcbdc136c98b TextScriptImporter: externalObjects: {} userData: diff --git a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2header.txt b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2header.txt new file mode 100644 index 00000000..f083e8b0 --- /dev/null +++ b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2header.txt @@ -0,0 +1,403 @@ +ant00,0,CC2 +ant01,CC2,18C3 +ant02,18C3,24DD +ant03,24DD,3280 +ant06,3280,3E84 +ant08,3E84,4A40 +ant09,4A40,5788 +bea00,5788,696A +bea01,696A,7A4A +bea02,7A4A,8CDB +bea03,8CDB,9D2C +bea05,9D2C,AF50 +bea06,AF50,C209 +bea07,C209,D1A0 +bea08,D1A0,E40D +bea09,E40D,F568 +bea10,F568,107F2 +bea11,107F2,11974 +bea12,11974,12BAA +bea13,12BAA,13EB2 +bea14,13EB2,15099 +bea15,15099,16130 +brd00,16130,16E09 +brd01,16E09,17C8F +brd02,17C8F,188EB +brd03,188EB,194D9 +brd04,194D9,1A221 +brd05,1A221,1AF01 +brd06,1AF01,1BC04 +brd08,1BC04,1C9BF +brd11,1C9BF,1D6BF +brd15,1D6BF,1E734 +brd16,1E734,1F586 +brd17,1F586,201F1 +brd18,201F1,20F1C +bul00,20F1C,221CE +bul01,221CE,2332D +bul03,2332D,2441B +bul05,2441B,253A4 +bul07,253A4,264D4 +bul08,264D4,27610 +cat00,27610,287B5 +cat01,287B5,299D6 +cat02,299D6,2AC0A +cat03,2AC0A,2BD75 +cat04,2BD75,2CFB6 +cat05,2CFB6,2E366 +cat06,2E366,2F572 +cat07,2F572,3068C +cat08,3068C,31A8E +cat09,31A8E,32D3D +cat10,32D3D,34067 +cat11,34067,3531B +cat12,3531B,36523 +cat13,36523,37911 +cat14,37911,38AF6 +cat15,38AF6,39C27 +cat16,39C27,3ADF6 +cat17,3ADF6,3C083 +cat18,3C083,3D1AB +cat19,3D1AB,3E404 +cat20,3E404,3F597 +cat21,3F597,407C2 +cat23,407C2,41AFF +cbr00,41AFF,42BE5 +cbr01,42BE5,43D5C +cbr02,43D5C,44F29 +cbr03,44F29,46094 +cbr04,46094,47174 +cbr05,47174,4823F +cbr06,4823F,49271 +cbr07,49271,4A1FC +cbr09,4A1FC,4B2A8 +cbr10,4B2A8,4C2D8 +cbr13,4C2D8,4D441 +cbr14,4D441,4E545 +cbr15,4E545,4F598 +cbr16,4F598,5067D +cbr17,5067D,518F5 +cbr18,518F5,527A0 +cbr19,527A0,539A0 +chn00,539A0,54810 +chn01,54810,557E8 +chn02,557E8,56844 +chn05,56844,57819 +chn09,57819,58718 +chn10,58718,5961A +chn11,5961A,5A63D +chn12,5A63D,5B660 +chn13,5B660,5C6C7 +cow00,5C6C7,5D6FB +cow01,5D6FB,5E862 +cow06,5E862,5F7F6 +cow07,5F7F6,60646 +crd00,60646,617BB +crd01,617BB,627C7 +crd02,627C7,63794 +crd04,63794,6457E +crd06,6457E,6558D +crd07,6558D,66480 +crd08,66480,6773E +der00,6773E,6871B +der01,6871B,69BC7 +der02,69BC7,6AE8D +der03,6AE8D,6C129 +der04,6C129,6D1F7 +der05,6D1F7,6E4B1 +der06,6E4B1,6F3E0 +der07,6F3E0,706F7 +der08,706F7,71634 +der09,71634,72AB1 +der10,72AB1,73AB1 +dog00,73AB1,749C9 +dog01,749C9,759CA +dog02,759CA,769BF +dog03,769BF,77817 +dog04,77817,78882 +dog05,78882,7991D +dog06,7991D,7A715 +dog07,7A715,7B693 +dog08,7B693,7C72C +dog09,7C72C,7D6A5 +dog10,7D6A5,7E7C0 +dog14,7E7C0,7F882 +dog15,7F882,80B24 +dog16,80B24,819AE +dog17,819AE,829C9 +dog18,829C9,83936 +duk00,83936,847C0 +duk01,847C0,85178 +duk02,85178,85F15 +duk03,85F15,86CE2 +duk04,86CE2,87A68 +duk05,87A68,88913 +duk06,88913,8971F +duk07,8971F,8A38D +duk08,8A38D,8B287 +duk09,8B287,8C015 +duk10,8C015,8CE97 +duk11,8CE97,8DC40 +duk12,8DC40,8EA1E +duk13,8EA1E,8F8C6 +duk15,8F8C6,909E4 +duk16,909E4,916DD +duk17,916DD,925FB +elp00,925FB,93248 +elp01,93248,93CAD +elp02,93CAD,94A5A +elp03,94A5A,956E6 +elp04,956E6,963EE +elp05,963EE,96E62 +elp06,96E62,97A2C +elp07,97A2C,986B0 +elp09,986B0,9953B +elp10,9953B,9A25E +elp11,9A25E,9AFA0 +elp12,9AFA0,9BA0F +flg00,9BA0F,9C7E2 +flg01,9C7E2,9DC25 +flg02,9DC25,9E991 +flg03,9E991,9F8D4 +flg04,9F8D4,A07AA +flg05,A07AA,A1584 +flg06,A1584,A2402 +flg07,A2402,A30DD +flg09,A30DD,A3DD5 +flg10,A3DD5,A4C68 +flg11,A4C68,A5906 +flg12,A5906,A6749 +flg13,A6749,A75EE +flg15,A75EE,A83FC +flg16,A83FC,A905F +flg17,A905F,A9FD3 +flg18,A9FD3,AADEF +flg19,AADEF,ABAE8 +goa00,ABAE8,AC95E +goa01,AC95E,AD694 +goa02,AD694,AE4C2 +goa04,AE4C2,AF4B4 +goa06,AF4B4,B0609 +goa07,B0609,B1448 +goa08,B1448,B23BC +goa09,B23BC,B321F +gor00,B321F,B42D2 +gor01,B42D2,B53A1 +gor02,B53A1,B66F7 +gor04,B66F7,B7850 +gor05,B7850,B885D +gor07,B885D,B9842 +gor08,B9842,BA854 +gor09,BA854,BB975 +gor10,BB975,BC8E9 +gor11,BC8E9,BD877 +ham00,BD877,BE924 +ham01,BE924,BFA7E +ham02,BFA7E,C09B8 +ham03,C09B8,C1C45 +ham04,C1C45,C2B1C +ham05,C2B1C,C3DEE +ham06,C3DEE,C4BC4 +ham07,C4BC4,C5A12 +hgc,C5A12,C6FD5 +hgh,C6FD5,C82A8 +hgs,C82A8,C9B85 +hip00,C9B85,CA7E4 +hip02,CA7E4,CB438 +hip03,CB438,CC02C +hip04,CC02C,CCCC0 +hip05,CCCC0,CD9F1 +hip08,CD9F1,CE805 +hip09,CE805,CF554 +hrs00,CF554,D0437 +hrs01,D0437,D1450 +hrs02,D1450,D2462 +hrs03,D2462,D3470 +hrs04,D3470,D41DF +hrs05,D41DF,D5127 +hrs06,D5127,D6010 +hrs07,D6010,D6E70 +hrs08,D6E70,D7C61 +hrs09,D7C61,D8A18 +hrs10,D8A18,D98BA +hrs11,D98BA,DA793 +hrs12,DA793,DB4D8 +hrs13,DB4D8,DC3AF +hrs16,DC3AF,DD131 +kal00,DD131,DE04E +kal01,DE04E,DF252 +kal02,DF252,E0307 +kal03,E0307,E135B +kal04,E135B,E22DD +kal05,E22DD,E3268 +kal08,E3268,E42AD +kal09,E42AD,E5216 +kal10,E5216,E62C3 +kgr00,E62C3,E7446 +kgr01,E7446,E8462 +kgr02,E8462,E93FD +kgr05,E93FD,EA4AC +kgr06,EA4AC,EB414 +kgr08,EB414,EC23A +kgr09,EC23A,ECEF9 +kgr10,ECEF9,EDE3A +lon00,EDE3A,EF037 +lon01,EF037,F0170 +lon02,F0170,F13C2 +lon04,F13C2,F2501 +lon06,F2501,F3811 +lon07,F3811,F4A99 +lon08,F4A99,F5BF5 +mnk01,F5BF5,F6AF8 +mnk02,F6AF8,F7990 +mnk03,F7990,F88CA +mnk04,F88CA,F97E7 +mnk05,F97E7,FA87D +mnk06,FA87D,FB95E +mnk07,FB95E,FC9B6 +mnk08,FC9B6,FDC52 +mus00,FDC52,FEF0D +mus01,FEF0D,100255 +mus02,100255,1015DC +mus03,1015DC,10297F +mus04,10297F,103AF2 +mus05,103AF2,104F5A +mus08,104F5A,106211 +mus09,106211,1075A0 +mus10,1075A0,108995 +mus12,108995,109B89 +mus14,109B89,10B034 +mus15,10B034,10C333 +mus16,10C333,10D68A +mus17,10D68A,10E753 +mus18,10E753,10F7EB +ocp00,10F7EB,1106C5 +ocp01,1106C5,1114D2 +ocp02,1114D2,112491 +ost00,112491,113239 +ost01,113239,113E57 +ost02,113E57,114AE5 +ost03,114AE5,115AE8 +ost05,115AE8,116A7D +ost06,116A7D,1177E4 +ost07,1177E4,11865C +ost08,11865C,11938A +ost09,11938A,119F04 +ost10,119F04,11ACE8 +owl,11ACE8,11BD77 +ows,11BD77,11CCC0 +pbr00,11CCC0,11DD6E +pbr01,11DD6E,11EBAF +pbr02,11EBAF,11FBDB +pbr03,11FBDB,120AE3 +pbr05,120AE3,121AD9 +pbr06,121AD9,122C8C +pbr07,122C8C,123E5E +pbr08,123E5E,124D2F +pbr09,124D2F,125A90 +pgn00,125A90,1265E2 +pgn01,1265E2,127244 +pgn02,127244,127E38 +pgn03,127E38,128D59 +pgn04,128D59,129969 +pgn05,129969,12A543 +pgn06,12A543,12B221 +pgn09,12B221,12C0AA +pgn10,12C0AA,12CFB2 +pgn11,12CFB2,12DCB4 +pgn12,12DCB4,12EA3E +pgn13,12EA3E,12F7F2 +pgn14,12F7F2,1306B3 +pig00,1306B3,13168E +pig01,13168E,132682 +pig02,132682,133738 +pig03,133738,13464A +pig04,13464A,135692 +pig05,135692,13671F +pig08,13671F,137726 +pig09,137726,1386F6 +pig10,1386F6,1397B1 +pig11,1397B1,13A7FF +pig13,13A7FF,13B883 +pig14,13B883,13C8C7 +pig15,13C8C7,13D780 +pig16,13D780,13E903 +pig17,13E903,13F8BE +rbt00,13F8BE,14099F +rbt01,14099F,141AA2 +rbt02,141AA2,1428D1 +rbt03,1428D1,143927 +rbt04,143927,1449DB +rbt05,1449DB,145ABD +rbt06,145ABD,146A1E +rbt07,146A1E,1479D8 +rbt08,1479D8,14868C +rbt09,14868C,149590 +rbt10,149590,14A7DF +rbt11,14A7DF,14B866 +rbt12,14B866,14C952 +rbt13,14C952,14DA35 +rbt14,14DA35,14EBAA +rbt15,14EBAA,14FBE3 +rbt16,14FBE3,150B8F +rbt17,150B8F,151B0E +rbt18,151B0E,1529FB +rbt19,1529FB,153A43 +rbt20,153A43,154B84 +rhn00,154B84,155A0E +rhn01,155A0E,1568C2 +rhn02,1568C2,157996 +rhn04,157996,158791 +rhn07,158791,1597DE +rhn08,1597DE,15A878 +shp00,15A878,15B6E3 +shp01,15B6E3,15C841 +shp02,15C841,15D7FB +shp03,15D7FB,15E7A8 +shp04,15E7A8,15F89A +shp07,15F89A,16087F +shp08,16087F,16186E +shp09,16186E,1629CB +shp10,1629CB,163A7F +shp11,163A7F,164C3E +shp12,164C3E,165DAD +shp13,165DAD,166F21 +shp14,166F21,167F0D +shp15,167F0D,168E5A +skk,168E5A,169D37 +squ00,169D37,16AC3C +squ01,16AC3C,16BC67 +squ02,16BC67,16CB52 +squ03,16CB52,16DB80 +squ04,16DB80,16EB87 +squ05,16EB87,16FC15 +squ06,16FC15,170C48 +squ07,170C48,171AC6 +squ08,171AC6,172A02 +squ09,172A02,173B12 +squ10,173B12,174B0C +squ11,174B0C,175A71 +squ13,175A71,176A36 +squ14,176A36,177803 +squ15,177803,178651 +squ16,178651,1794EA +squ17,1794EA,17A3FF +squ18,17A3FF,17B392 +tig00,17B392,17C638 +tig01,17C638,17D7CA +tig02,17D7CA,17EBF7 +tig03,17EBF7,17FEB4 +tig04,17FEB4,181126 +tig05,181126,182387 +tig06,182387,18359F +wol00,18359F,18451D +wol01,18451D,1857EC +wol02,1857EC,186842 +wol03,186842,187764 +wol04,187764,1887CD +wol05,1887CD,1899F8 +wol06,1899F8,18A93C +wol08,18A93C,18B8AF +wol09,18B8AF,18C967 +wol10,18C967,18DAC5 +wol12,18DAC5,18EA8F diff --git a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdumpheader.txt.meta b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2header.txt.meta similarity index 75% rename from ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdumpheader.txt.meta rename to ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2header.txt.meta index a9bd1f02..0945ab2b 100644 --- a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdumpheader.txt.meta +++ b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdump2header.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 732eb258d20636248839f67949a75649 +guid: 5d54cf2c74468bf4f80a686cf93c0ccc TextScriptImporter: externalObjects: {} userData: diff --git a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdumpheader.txt b/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdumpheader.txt deleted file mode 100644 index 75df890e..00000000 --- a/ACNHMS_Source/Assets/Resources/SpriteLoading/villagerdumpheader.txt +++ /dev/null @@ -1,397 +0,0 @@ -ant00,0,1571 -ant01,1571,29DB -ant02,29DB,3F23 -ant03,3F23,57C9 -ant06,57C9,6C5D -ant08,6C5D,7E9F -ant09,7E9F,95E7 -bea00,95E7,B730 -bea01,B730,D63F -bea02,D63F,F9B0 -bea03,F9B0,11889 -bea05,11889,13A75 -bea06,13A75,15B9F -bea07,15B9F,1787D -bea08,1787D,19C7C -bea09,19C7C,1BD7E -bea10,1BD7E,1E142 -bea11,1E142,200C3 -bea12,200C3,222A2 -bea13,222A2,2445B -bea14,2445B,2671C -bea15,2671C,2842F -brd00,2842F,29B02 -brd01,29B02,2B522 -brd02,2B522,2CAA8 -brd03,2CAA8,2DD65 -brd04,2DD65,2F4E9 -brd05,2F4E9,3081F -brd06,3081F,31E8B -brd08,31E8B,33710 -brd11,33710,34E7D -brd15,34E7D,36B2C -brd16,36B2C,3856F -brd17,3856F,39A49 -brd18,39A49,3B244 -bul00,3B244,3DAD3 -bul01,3DAD3,3FE43 -bul03,3FE43,420E0 -bul05,420E0,43F1A -bul07,43F1A,463ED -bul08,463ED,48820 -cat00,48820,4A4AE -cat01,4A4AE,4C7D6 -cat02,4C7D6,4E93E -cat03,4E93E,50914 -cat04,50914,52532 -cat05,52532,54AF2 -cat06,54AF2,56CDE -cat07,56CDE,58C24 -cat08,58C24,5B37C -cat09,5B37C,5D7E5 -cat10,5D7E5,5FE67 -cat11,5FE67,622D7 -cat12,622D7,6475E -cat13,6475E,66C22 -cat14,66C22,68F65 -cat15,68F65,6AFD3 -cat16,6AFD3,6D02C -cat17,6D02C,6F23D -cat18,6F23D,71077 -cat19,71077,73307 -cat20,73307,753E5 -cat21,753E5,77644 -cat23,77644,798C5 -cbr00,798C5,7B8A9 -cbr01,7B8A9,7D94C -cbr02,7D94C,7FBA1 -cbr03,7FBA1,81C8B -cbr04,81C8B,83CB1 -cbr05,83CB1,85C29 -cbr06,85C29,879CB -cbr07,879CB,89742 -cbr09,89742,8B4D9 -cbr10,8B4D9,8D360 -cbr13,8D360,8F5A1 -cbr14,8F5A1,91602 -cbr15,91602,93378 -cbr16,93378,953CD -cbr17,953CD,97659 -cbr19,97659,99669 -chn00,99669,9AF71 -chn01,9AF71,9CAF8 -chn02,9CAF8,9EA0F -chn05,9EA0F,A0951 -chn09,A0951,A253B -chn10,A253B,A405E -chn11,A405E,A6002 -chn12,A6002,A7E1F -chn13,A7E1F,A9DB2 -cow00,A9DB2,ABED7 -cow01,ABED7,AE076 -cow06,AE076,AFFF6 -cow07,AFFF6,B1B3B -crd00,B1B3B,B3CD4 -crd01,B3CD4,B5D82 -crd02,B5D82,B7CAD -crd04,B7CAD,B9600 -crd06,B9600,BB535 -crd07,BB535,BD047 -crd08,BD047,BF6C4 -der00,BF6C4,C14D2 -der01,C14D2,C3FF1 -der02,C3FF1,C661D -der03,C661D,C8B46 -der04,C8B46,CAAF1 -der05,CAAF1,CD2D8 -der06,CD2D8,CEF4B -der07,CEF4B,D1653 -der08,D1653,D32FE -der09,D32FE,D5C64 -dog00,D5C64,D75D6 -dog01,D75D6,D93D9 -dog02,D93D9,DB192 -dog03,DB192,DCC0D -dog04,DCC0D,DE9AF -dog05,DE9AF,E086D -dog06,E086D,E221E -dog07,E221E,E3BD2 -dog08,E3BD2,E5A98 -dog09,E5A98,E7896 -dog10,E7896,E9945 -dog14,E9945,EB9E2 -dog15,EB9E2,EE084 -dog16,EE084,EF938 -dog17,EF938,F17E9 -dog18,F17E9,F34E2 -duk00,F34E2,F4CE9 -duk01,F4CE9,F5AA5 -duk02,F5AA5,F7150 -duk03,F7150,F8852 -duk04,F8852,FA12D -duk05,FA12D,FBACB -duk06,FBACB,FD39D -duk07,FD39D,FE90E -duk08,FE90E,10052E -duk09,10052E,101D2D -duk10,101D2D,10375F -duk11,10375F,10509C -duk12,10509C,106652 -duk13,106652,107FAE -duk15,107FAE,109F1D -duk16,109F1D,10B5EA -duk17,10B5EA,10D18A -elp00,10D18A,10E668 -elp01,10E668,10F708 -elp02,10F708,1111CD -elp03,1111CD,112676 -elp04,112676,113C06 -elp05,113C06,114C02 -elp06,114C02,115F4A -elp07,115F4A,11746D -elp09,11746D,118F1D -elp10,118F1D,11A4AC -elp12,11A4AC,11B4FC -flg00,11B4FC,11CB43 -flg01,11CB43,11F5BD -flg02,11F5BD,120E05 -flg03,120E05,122AAC -flg04,122AAC,1244BA -flg05,1244BA,125D3C -flg06,125D3C,1275AB -flg07,1275AB,128AAB -flg09,128AAB,12A0C4 -flg10,12A0C4,12B96B -flg11,12B96B,12CDFE -flg12,12CDFE,12E83C -flg13,12E83C,130394 -flg15,130394,131D15 -flg16,131D15,13317D -flg17,13317D,134E20 -flg18,134E20,13662E -flg19,13662E,137DBA -goa00,137DBA,139814 -goa01,139814,13ADE5 -goa02,13ADE5,13C88C -goa04,13C88C,13E7AB -goa06,13E7AB,1408D1 -goa07,1408D1,14222F -goa08,14222F,143E77 -goa09,143E77,14566D -gor00,14566D,1476BA -gor01,1476BA,149835 -gor02,149835,14BE65 -gor04,14BE65,14E0DD -gor05,14E0DD,1500A7 -gor07,1500A7,151F88 -gor08,151F88,1540FF -gor09,1540FF,1565DE -gor10,1565DE,15822F -ham00,15822F,159FC3 -ham01,159FC3,15C1DD -ham02,15C1DD,15DCAF -ham03,15DCAF,15FFB2 -ham04,15FFB2,1619CE -ham05,1619CE,163C78 -ham06,163C78,1652AF -ham07,1652AF,166B17 -hgc,166B17,1698A5 -hgh,1698A5,16BBB3 -hgs,16BBB3,16F1A5 -hip00,16F1A5,1706A0 -hip02,1706A0,171A7E -hip03,171A7E,172DC5 -hip04,172DC5,17423B -hip05,17423B,175894 -hip08,175894,177274 -hip09,177274,178AF6 -hrs00,178AF6,17A5B6 -hrs01,17A5B6,17C5FD -hrs02,17C5FD,17E329 -hrs03,17E329,17FD65 -hrs04,17FD65,18140A -hrs05,18140A,182F9D -hrs06,182F9D,18469B -hrs07,18469B,186016 -hrs08,186016,187848 -hrs09,187848,189183 -hrs10,189183,18AC07 -hrs11,18AC07,18C7F3 -hrs12,18C7F3,18DF3D -hrs13,18DF3D,18F6D2 -hrs16,18F6D2,190F60 -kal00,190F60,192C84 -kal01,192C84,1951F8 -kal02,1951F8,1971FA -kal03,1971FA,1990CA -kal04,1990CA,19AD75 -kal05,19AD75,19CA7E -kal08,19CA7E,19E981 -kal09,19E981,1A0601 -kal10,1A0601,1A2705 -kgr00,1A2705,1A4978 -kgr01,1A4978,1A67E6 -kgr02,1A67E6,1A8508 -kgr05,1A8508,1AA28B -kgr06,1AA28B,1ABF28 -kgr08,1ABF28,1AD8A8 -kgr09,1AD8A8,1AEFA9 -kgr10,1AEFA9,1B0C0B -lon00,1B0C0B,1B30EB -lon01,1B30EB,1B53ED -lon02,1B53ED,1B7971 -lon04,1B7971,1B9CAE -lon06,1B9CAE,1BC387 -lon07,1BC387,1BE857 -lon08,1BE857,1C0B36 -mnk01,1C0B36,1C24E9 -mnk02,1C24E9,1C4121 -mnk03,1C4121,1C5BC2 -mnk04,1C5BC2,1C7735 -mnk05,1C7735,1C96C5 -mnk06,1C96C5,1CB586 -mnk07,1CB586,1CD298 -mnk08,1CD298,1CF472 -mus00,1CF472,1D152A -mus01,1D152A,1D39FA -mus02,1D39FA,1D5E45 -mus03,1D5E45,1D83E8 -mus04,1D83E8,1DA3DC -mus05,1DA3DC,1DCC00 -mus08,1DCC00,1DEF37 -mus09,1DEF37,1E160B -mus10,1E160B,1E3D03 -mus12,1E3D03,1E5E63 -mus14,1E5E63,1E8885 -mus15,1E8885,1EAC5B -mus16,1EAC5B,1ED44B -mus17,1ED44B,1EF2F0 -mus18,1EF2F0,1F1054 -ocp00,1F1054,1F2B10 -ocp01,1F2B10,1F431B -ocp02,1F431B,1F5CDC -ost00,1F5CDC,1F7674 -ost01,1F7674,1F8BDC -ost02,1F8BDC,1FA04B -ost03,1FA04B,1FBE66 -ost05,1FBE66,1FDDC2 -ost06,1FDDC2,1FF4B2 -ost07,1FF4B2,200E5E -ost08,200E5E,202426 -ost09,202426,20361F -ost10,20361F,204DFA -owl,204DFA,206C05 -ows,206C05,208780 -pbr00,208780,20A29A -pbr01,20A29A,20BCFE -pbr02,20BCFE,20DBA2 -pbr03,20DBA2,20F68E -pbr05,20F68E,2112FE -pbr06,2112FE,213714 -pbr07,213714,215B4B -pbr08,215B4B,2178EF -pbr09,2178EF,219046 -pgn00,219046,21A302 -pgn01,21A302,21B640 -pgn02,21B640,21CA77 -pgn03,21CA77,21E4DF -pgn04,21E4DF,21F9B0 -pgn05,21F9B0,220DC5 -pgn06,220DC5,2224C7 -pgn09,2224C7,223BB3 -pgn10,223BB3,225C40 -pgn11,225C40,227332 -pgn12,227332,228BB5 -pgn13,228BB5,22A4DF -pgn14,22A4DF,22BFEC -pig00,22BFEC,22DC17 -pig01,22DC17,22F6C3 -pig02,22F6C3,231682 -pig03,231682,23329B -pig04,23329B,234FE2 -pig05,234FE2,236D51 -pig08,236D51,238BBD -pig09,238BBD,23A872 -pig10,23A872,23C6F1 -pig11,23C6F1,23E5A8 -pig13,23E5A8,2403EF -pig14,2403EF,242220 -pig15,242220,243BF3 -pig16,243BF3,245BF6 -pig17,245BF6,2477DE -rbt00,2477DE,24954A -rbt01,24954A,24B1F9 -rbt02,24B1F9,24C884 -rbt03,24C884,24E597 -rbt04,24E597,25034A -rbt05,25034A,251EFD -rbt06,251EFD,253A77 -rbt07,253A77,2557B0 -rbt08,2557B0,256C42 -rbt09,256C42,258572 -rbt10,258572,25A5DF -rbt11,25A5DF,25C4B1 -rbt12,25C4B1,25E2B5 -rbt13,25E2B5,260036 -rbt14,260036,261DC9 -rbt15,261DC9,263D7B -rbt16,263D7B,265AE0 -rbt17,265AE0,26752E -rbt18,26752E,268F1C -rbt19,268F1C,26ABC4 -rhn00,26ABC4,26C6C4 -rhn01,26C6C4,26E198 -rhn02,26E198,2700DE -rhn04,2700DE,2719E1 -rhn07,2719E1,273838 -rhn08,273838,27585E -shp00,27585E,27721C -shp01,27721C,27951A -shp02,27951A,27B30B -shp03,27B30B,27D110 -shp04,27D110,27F158 -shp07,27F158,28111E -shp08,28111E,282ED9 -shp09,282ED9,285170 -shp10,285170,287250 -shp11,287250,28968C -shp12,28968C,28BA8E -shp13,28BA8E,28DD3C -shp15,28DD3C,28F88C -skk,28F88C,2917AB -squ00,2917AB,293121 -squ01,293121,294EF9 -squ02,294EF9,2969A3 -squ03,2969A3,298882 -squ04,298882,29A5D6 -squ05,29A5D6,29C804 -squ06,29C804,29E4D2 -squ07,29E4D2,29FE59 -squ08,29FE59,2A1A4E -squ09,2A1A4E,2A39F6 -squ10,2A39F6,2A5765 -squ11,2A5765,2A73E3 -squ13,2A73E3,2A9382 -squ14,2A9382,2AADD5 -squ15,2AADD5,2AC61F -squ16,2AC61F,2AE000 -squ17,2AE000,2AFA6D -squ18,2AFA6D,2B152B -tig00,2B152B,2B36E7 -tig01,2B36E7,2B5955 -tig02,2B5955,2B8413 -tig03,2B8413,2BABD5 -tig04,2BABD5,2BD2C3 -tig05,2BD2C3,2BF81B -tig06,2BF81B,2C1C04 -wol00,2C1C04,2C3A9E -wol01,2C3A9E,2C61EC -wol02,2C61EC,2C846B -wol03,2C846B,2CA0E2 -wol04,2CA0E2,2CC1E6 -wol05,2CC1E6,2CE4C6 -wol06,2CE4C6,2D0168 -wol08,2D0168,2D218F -wol09,2D218F,2D40FA -wol10,2D40FA,2D6599 -wol12,2D6599,2D84BD diff --git a/ACNHMS_Source/Assets/Scripts/ACNHMS/AdditionalPanel/UI_Villager.cs b/ACNHMS_Source/Assets/Scripts/ACNHMS/AdditionalPanel/UI_Villager.cs index b037af7d..ae8afeb6 100644 --- a/ACNHMS_Source/Assets/Scripts/ACNHMS/AdditionalPanel/UI_Villager.cs +++ b/ACNHMS_Source/Assets/Scripts/ACNHMS/AdditionalPanel/UI_Villager.cs @@ -14,7 +14,7 @@ public class UI_Villager : IUI_Additional const int VillagerHousesSize = VillagerHouse.SIZE * 10; // sprites - public static string VillagerFilename = "villagerdump"; + public static string VillagerFilename = "villagerdump2"; public static string VillagerFilenameHeader = VillagerFilename + "header"; public static string VillagerPath { get { return SpriteBehaviour.UsableImagePath + Path.DirectorySeparatorChar + VillagerFilename; } } public static string VillagerHeaderPath { get { return SpriteBehaviour.UsableImagePath + Path.DirectorySeparatorChar + VillagerFilenameHeader; } } diff --git a/ACNHMS_Source/Assets/Scripts/Tools/OffsetHelper.cs b/ACNHMS_Source/Assets/Scripts/Tools/OffsetHelper.cs index 0bba99fa..da175e83 100644 --- a/ACNHMS_Source/Assets/Scripts/Tools/OffsetHelper.cs +++ b/ACNHMS_Source/Assets/Scripts/Tools/OffsetHelper.cs @@ -10,7 +10,7 @@ public static class OffsetHelper public const ulong PlayerOtherStartPadding = 0x36A50; // player other - public const ulong InventoryOffset = 0xAE19C778; // player 0 (A) done + public const ulong InventoryOffset = 0xAE19C778; // player 0 (A) private const ulong playerOtherStart = InventoryOffset - 0x10; // helps to get other values, unused public const ulong WalletAddress = InventoryOffset + 0xB8; @@ -25,31 +25,29 @@ public static class OffsetHelper public static ulong getTownNameAddress(ulong invOffset) => getPlayerIdAddress(invOffset) - 0xB8 + 0x04; // main save offsets - public const ulong TurnipAddress = 0xAD195B74; // done - public const ulong VillagerAddress = TurnipAddress - 0x2cb0 - 0x43be1c + 0x10 - 0x90; // done - public const ulong VillagerHouseAddress = TurnipAddress - 0x2cb0 - 0x43be1c + 0x43abd4 - 0x90; // done - public const ulong BackupSaveDiff = 0x849C50; + public const ulong TurnipAddress = 0xAD195B74; + public const ulong VillagerAddress = TurnipAddress - 0x2cb0 - 0x43be1c + 0x10 - 0x90; + public const ulong VillagerHouseAddress = TurnipAddress - 0x2cb0 - 0x43be1c + 0x43abd4 - 0x90; + public const ulong BackupSaveDiff = 0x86D580; - public const ulong FieldItemStart = VillagerAddress - 0x10 + 0x22e1a8; // done - public const ulong LandMakingMapStart = FieldItemStart + 0xAAA00; // done - public const ulong OutsideFieldStart = FieldItemStart + 0xCF998; // done - public const ulong MainFieldStructurStart = FieldItemStart + 0xCF600; // done + public const ulong FieldItemStart = VillagerAddress - 0x10 + 0x22e1a8; + public const ulong LandMakingMapStart = FieldItemStart + 0xAAA00; + public const ulong OutsideFieldStart = FieldItemStart + 0xCF998; + public const ulong MainFieldStructurStart = FieldItemStart + 0xCF600; // other addresses - public const ulong ArriverNameLocAddress = 0xB66F8208; + public const ulong ArriverNameLocAddress = 0xB6351EA0; public const ulong ArriverVillageLocAddress = ArriverNameLocAddress - 0x1C; - public const ulong TextSpeedAddress = 0xBA88BC8; // done - //public const ulong ChatBufferAddressEUen = 0x42F216C8; - //public const ulong ChatBufferAddressUSen = ChatBufferAddressEUen - 0x80; + public const ulong TextSpeedAddress = 0xBA88BC8; public const ulong ChatBufferSize = 0x1E; - public const ulong DodoAddress = 0x09F52E3C; - public const ulong OnlineSessionAddress = 0x920C740; // done - public const ulong OnlineSessionVisitorAddress = 0x9D2FFB0; + public const ulong DodoAddress = 0xA98D15C; + public const ulong OnlineSessionAddress = 0x920C740; + public const ulong OnlineSessionVisitorAddress = 0x9D3BFB0; public const ulong OnlineSessionVisitorSize = 0x448; // reverse order // pointers - public static readonly long[] PlayerCoordJumps = new long[5] { 0x39DC030L, 0x18L, 0x178L, 0xD0L, 0xD8L }; // done + public static readonly long[] PlayerCoordJumps = new long[5] { 0x39DC030L, 0x18L, 0x178L, 0xD0L, 0xD8L }; public static readonly long[] ChatCoordJumps = new long[2] { 0x03C3EED0L, 0x40L }; } diff --git a/ACNHMS_Source/ProjectSettings/GraphicsSettings.asset b/ACNHMS_Source/ProjectSettings/GraphicsSettings.asset index a6d4104c..10edde85 100644 --- a/ACNHMS_Source/ProjectSettings/GraphicsSettings.asset +++ b/ACNHMS_Source/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ACNHMS_Source/ProjectSettings/ProjectSettings.asset b/ACNHMS_Source/ProjectSettings/ProjectSettings.asset index a65a24c1..4e3cc171 100644 --- a/ACNHMS_Source/ProjectSettings/ProjectSettings.asset +++ b/ACNHMS_Source/ProjectSettings/ProjectSettings.asset @@ -121,7 +121,7 @@ PlayerSettings: 16:10: 0 16:9: 0 Others: 1 - bundleVersion: 0.87 + bundleVersion: 0.9 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0