From 8551c4142b8fcadbf7903a0b71e56822bf33fa40 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Tue, 18 Nov 2014 16:28:47 -0700 Subject: =?UTF-8?q?=E2=80=9Cunknown2=E2=80=9D=20is=20happiness.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/extractrostertbltbl.c | 6 +++--- utils/json2rostertbl.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'utils') diff --git a/utils/extractrostertbltbl.c b/utils/extractrostertbltbl.c index d24dbde..35676e2 100644 --- a/utils/extractrostertbltbl.c +++ b/utils/extractrostertbltbl.c @@ -1326,7 +1326,7 @@ main(int argc, char *argv[]) fprintf(outfile, "\t\"unknown2\": \"0x%x\",\n", byte); } if ((byte = fgetc(rom)) != 0) { - fprintf(outfile, "\t\"unknown3\": \"0x%x\",\n", byte); + fprintf(outfile, "\t\"happiness\": \"0x%x\",\n", byte); } byte = fgetc(rom) << 8; @@ -1414,7 +1414,7 @@ main(int argc, char *argv[]) fprintf(outfile, "\t\t\"unknown2\": \"0x%x\",\n", byte); } if ((byte = fgetc(rom)) != 0) { - fprintf(outfile, "\t\t\"unknown3\": \"0x%x\",\n", byte); + fprintf(outfile, "\t\t\"happiness\": \"0x%x\",\n", byte); } byte = fgetc(rom) << 8; byte |= fgetc(rom); @@ -1447,7 +1447,7 @@ main(int argc, char *argv[]) } for (; mon < 6; ++mon) { - /* if a team has less than six mons, the blank spaces are filled by: level1 bulbasaur, unknown3 = 0x7f, DVs = 0x6777 */ + /* if a team has less than six mons, the blank spaces are filled by: level1 bulbasaur, happiness = 0x7f, DVs = 0x6777 */ fgetc(rom); fgetc(rom); fgetc(rom); diff --git a/utils/json2rostertbl.c b/utils/json2rostertbl.c index 6b31cef..a46f688 100644 --- a/utils/json2rostertbl.c +++ b/utils/json2rostertbl.c @@ -172,7 +172,7 @@ printpokemon(struct json_object *k) optional8id(k, l, "move3", strtomove); optional8id(k, l, "move4", strtomove); optional8strint(k, l, "unknown2"); - optional8strint(k, l, "unknown3"); + optional8strint(k, l, "happiness"); required16strint(k, l, "hp exp"); required16strint(k, l, "attack exp"); required16strint(k, l, "defense exp"); -- cgit v1.2.3