Merge pull request #16 from Slattz/master

Changes to Catalog & Encyclopedia

Author: marcrobledo

acnl_editor.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# last update: 20170826
+# last update: 20170908
 #CACHE:
 index.html
 help.html

data/acnl_editor.js

@@ -70,7 +70,8 @@ var Offsets={
 	PLAYER_TPCTEXT:			0x6b24,
 	PLAYER_PLAYTIME:		0x6b90,
 	PLAYER_POCKETS:			0x6bb0,
-	PLAYER_CATALOG:			0x6c00, //starts with encyclopedia
+    PLAYER_ENCYCLOPEDIA:    0x6c50,
+	PLAYER_CATALOG:			0x6c70,
 	PLAYER_BANK:			0x6b6c,
 	PLAYER_MEDALS:			0x6b7c,
 	PLAYER_WALLET:			0x6e38,
@@ -175,7 +176,8 @@ const OffsetsPlus={
 	PLAYER_TPCTEXT:			0x6b38,
 	PLAYER_PLAYTIME:		0x6bb0,
 	PLAYER_POCKETS:			0x6bd0,
-	PLAYER_CATALOG:			0x6c20, //starts with encyclopedia
+    PLAYER_ENCYCLOPEDIA:    0x6c70,
+	PLAYER_CATALOG:			0x6c90,
 	PLAYER_BANK:			0x6b8c,
 	PLAYER_MEDALS:			0x6b9c,
 	PLAYER_WALLET:			0x6f08,
@@ -235,7 +237,7 @@ const Constants={
 		BADGES:['Fishes','Bugs','Marine','Fish collection','Bug collection','Marine collection','Balloons','Visiting other towns','Being visited','Watering flowers','Bank','Turnips','Medals','StreetPass','Weeds','Shopping','Letters','Refurbishing','Catalog','K.K. Slider','Home points','Time played','Helping neighbors','Dream Suite']
 	},
 
-	FULL_ENCYCLOPEDIA:[0xfe,0xff,0x12,0xef,0x7f,0xfd,0x7d,0x87,0xc1,0x38,0x80,0xa3,0x01,0x00,0x00,0x00,0xf0,0xff,0xfb,0xff,0x83,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xff,0xff,0x29,0xd1,0xff,0xff,0xff,0x7f,0x3f,0xaf,0xef,0xff,0x7f,0x11,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x5f,0xf7,0xfd,0x85,0xaf,0xff,0x77,0x04,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xbf,0x67,0x01,0x75,0x79,0x3e,0xdd,0xb8],
+	FULL_ENCYCLOPEDIA:[0xcc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd0,0x9a],
 	ALL_EMOTIONS:[
 		0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,
 		0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,
@@ -2221,7 +2223,7 @@ Player.prototype.unlockEmotions=function(){
 }
 Player.prototype.fillEncyclopedia=function(){
 	MarcDialogs.confirm('Do you want to fill encyclopedia up for this player?<br/>'+getWarningMessage(), function(){
-		var encyclopediaOffset=currentPlayer.offset+Offsets.PLAYER_CATALOG;
+		var encyclopediaOffset=currentPlayer.offset+Offsets.PLAYER_ENCYCLOPEDIA;
 		for(var i=0; i<Constants.FULL_ENCYCLOPEDIA.length; i++)
 			savegame.storeByte(encyclopediaOffset+i, Constants.FULL_ENCYCLOPEDIA[i]);
 		MarcDialogs.alert('Encyclopedia was filled for this player.');
@@ -2230,7 +2232,7 @@ Player.prototype.fillEncyclopedia=function(){
 Player.prototype.fillCatalog=function(){
 	MarcDialogs.confirm('Do you want to fill catalog up for this player?<br/>'+getWarningMessage(), function(){
 		var catalogOffset=currentPlayer.offset+Offsets.PLAYER_CATALOG;
-		var maxInts=plusMode?180:136;
+		var maxInts=plusMode?106:56; //Non PlusMode size is only estimate
 		for(var i=0; i<maxInts; i++)
 			savegame.storeByte4(catalogOffset+i*4, 0xffffffff);
 		MarcDialogs.alert('Catalog was filled for this player.');

index.html

@@ -18,7 +18,7 @@
 		<span class="logo"></span>
 		<h1>Animal Crossing: New Leaf Save Editor</h1>
 		<div class="author">
-			by <a href="http://www.marcrobledo.com" target="_blank">Marc Robledo</a> <span class="last-update">(last updated on 26th Aug 2017)</span>
+			by <a href="http://www.marcrobledo.com" target="_blank">Marc Robledo</a> <span class="last-update">(last updated on 8th Sept 2017)</span>
 		</div>
 
 		<div id="help">