summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-18 15:34:00 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-18 15:34:00 -0400
commitdf799584eca94f51870572612c333dc062982c0d (patch)
tree9b905bdd0d8aa31126cc0251dfa891207104aaa7
parent205e3d6a299aab4f9ee9c613234f359d11674c39 (diff)
Decompile pms to JSON
-rw-r--r--.gitignore1
-rw-r--r--files/poketool/personal/growtbl.json852
-rw-r--r--files/poketool/personal/growtbl.json.txt12
-rw-r--r--files/poketool/personal/growtbl/.gitignore2
-rw-r--r--files/poketool/personal/growtbl/.knarcignore3
-rw-r--r--files/poketool/personal/growtbl/narc_0000.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0001.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0002.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0003.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0004.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0005.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0006.txt101
-rw-r--r--files/poketool/personal/growtbl/narc_0007.txt101
-rw-r--r--files/poketool/personal/pms.json505
-rw-r--r--files/poketool/personal/pms.json.txt8
-rw-r--r--files/poketool/personal/pms.narcbin1002 -> 0 bytes
-rw-r--r--filesystem.mk12
-rw-r--r--tools/o2narc/o2narc.cpp6
18 files changed, 1387 insertions, 822 deletions
diff --git a/.gitignore b/.gitignore
index 0358c3ab..fcfaecac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,5 @@ symbols.csv
# NARCs
*.narc
*.arc
-!files/poketool/personal/pms.narc
files/**/*.c
*.o
diff --git a/files/poketool/personal/growtbl.json b/files/poketool/personal/growtbl.json
new file mode 100644
index 00000000..69ac3a3d
--- /dev/null
+++ b/files/poketool/personal/growtbl.json
@@ -0,0 +1,852 @@
+{
+ "growtbl": [
+ {
+ "name": "MEDIUM_FAST",
+ "table": [
+ 0,
+ 0,
+ 8,
+ 27,
+ 64,
+ 125,
+ 216,
+ 343,
+ 512,
+ 729,
+ 1000,
+ 1331,
+ 1728,
+ 2197,
+ 2744,
+ 3375,
+ 4096,
+ 4913,
+ 5832,
+ 6859,
+ 8000,
+ 9261,
+ 10648,
+ 12167,
+ 13824,
+ 15625,
+ 17576,
+ 19683,
+ 21952,
+ 24389,
+ 27000,
+ 29791,
+ 32768,
+ 35937,
+ 39304,
+ 42875,
+ 46656,
+ 50653,
+ 54872,
+ 59319,
+ 64000,
+ 68921,
+ 74088,
+ 79507,
+ 85184,
+ 91125,
+ 97336,
+ 103823,
+ 110592,
+ 117649,
+ 125000,
+ 132651,
+ 140608,
+ 148877,
+ 157464,
+ 166375,
+ 175616,
+ 185193,
+ 195112,
+ 205379,
+ 216000,
+ 226981,
+ 238328,
+ 250047,
+ 262144,
+ 274625,
+ 287496,
+ 300763,
+ 314432,
+ 328509,
+ 343000,
+ 357911,
+ 373248,
+ 389017,
+ 405224,
+ 421875,
+ 438976,
+ 456533,
+ 474552,
+ 493039,
+ 512000,
+ 531441,
+ 551368,
+ 571787,
+ 592704,
+ 614125,
+ 636056,
+ 658503,
+ 681472,
+ 704969,
+ 729000,
+ 753571,
+ 778688,
+ 804357,
+ 830584,
+ 857375,
+ 884736,
+ 912673,
+ 941192,
+ 970299,
+ 1000000
+ ]
+ },
+ {
+ "name": "ERRATIC",
+ "table": [
+ 0,
+ 0,
+ 15,
+ 52,
+ 122,
+ 237,
+ 406,
+ 637,
+ 942,
+ 1326,
+ 1800,
+ 2369,
+ 3041,
+ 3822,
+ 4719,
+ 5737,
+ 6881,
+ 8155,
+ 9564,
+ 11111,
+ 12800,
+ 14632,
+ 16610,
+ 18737,
+ 21012,
+ 23437,
+ 26012,
+ 28737,
+ 31610,
+ 34632,
+ 37800,
+ 41111,
+ 44564,
+ 48155,
+ 51881,
+ 55737,
+ 59719,
+ 63822,
+ 68041,
+ 72369,
+ 76800,
+ 81326,
+ 85942,
+ 90637,
+ 95406,
+ 100237,
+ 105122,
+ 110052,
+ 115015,
+ 120001,
+ 125000,
+ 131324,
+ 137795,
+ 144410,
+ 151165,
+ 158056,
+ 165079,
+ 172229,
+ 179503,
+ 186894,
+ 194400,
+ 202013,
+ 209728,
+ 217540,
+ 225443,
+ 233431,
+ 241496,
+ 249633,
+ 257834,
+ 267406,
+ 276458,
+ 286328,
+ 296358,
+ 305767,
+ 316074,
+ 326531,
+ 336255,
+ 346965,
+ 357812,
+ 367807,
+ 378880,
+ 390077,
+ 400293,
+ 411686,
+ 423190,
+ 433572,
+ 445239,
+ 457001,
+ 467489,
+ 479378,
+ 491346,
+ 501878,
+ 513934,
+ 526049,
+ 536557,
+ 548720,
+ 560922,
+ 571333,
+ 583539,
+ 591882,
+ 600000
+ ]
+ },
+ {
+ "name": "FLUCTUATING",
+ "table": [
+ 0,
+ 0,
+ 4,
+ 13,
+ 32,
+ 65,
+ 112,
+ 178,
+ 276,
+ 393,
+ 540,
+ 745,
+ 967,
+ 1230,
+ 1591,
+ 1957,
+ 2457,
+ 3046,
+ 3732,
+ 4526,
+ 5440,
+ 6482,
+ 7666,
+ 9003,
+ 10506,
+ 12187,
+ 14060,
+ 16140,
+ 18439,
+ 20974,
+ 23760,
+ 26811,
+ 30146,
+ 33780,
+ 37731,
+ 42017,
+ 46656,
+ 50653,
+ 55969,
+ 60505,
+ 66560,
+ 71677,
+ 78533,
+ 84277,
+ 91998,
+ 98415,
+ 107069,
+ 114205,
+ 123863,
+ 131766,
+ 142500,
+ 151222,
+ 163105,
+ 172697,
+ 185807,
+ 196322,
+ 210739,
+ 222231,
+ 238036,
+ 250562,
+ 267840,
+ 281456,
+ 300293,
+ 315059,
+ 335544,
+ 351520,
+ 373744,
+ 390991,
+ 415050,
+ 433631,
+ 459620,
+ 479600,
+ 507617,
+ 529063,
+ 559209,
+ 582187,
+ 614566,
+ 639146,
+ 673863,
+ 700115,
+ 737280,
+ 765275,
+ 804997,
+ 834809,
+ 877201,
+ 908905,
+ 954084,
+ 987754,
+ 1035837,
+ 1071552,
+ 1122660,
+ 1160499,
+ 1214753,
+ 1254796,
+ 1312322,
+ 1354652,
+ 1415577,
+ 1460276,
+ 1524731,
+ 1571884,
+ 1640000
+ ]
+ },
+ {
+ "name": "MEDIUM_SLOW",
+ "table": [
+ 0,
+ 0,
+ 9,
+ 57,
+ 96,
+ 135,
+ 179,
+ 236,
+ 314,
+ 419,
+ 560,
+ 742,
+ 973,
+ 1261,
+ 1612,
+ 2035,
+ 2535,
+ 3120,
+ 3798,
+ 4575,
+ 5460,
+ 6458,
+ 7577,
+ 8825,
+ 10208,
+ 11735,
+ 13411,
+ 15244,
+ 17242,
+ 19411,
+ 21760,
+ 24294,
+ 27021,
+ 29949,
+ 33084,
+ 36435,
+ 40007,
+ 43808,
+ 47846,
+ 52127,
+ 56660,
+ 61450,
+ 66505,
+ 71833,
+ 77440,
+ 83335,
+ 89523,
+ 96012,
+ 102810,
+ 109923,
+ 117360,
+ 125126,
+ 133229,
+ 141677,
+ 150476,
+ 159635,
+ 169159,
+ 179056,
+ 189334,
+ 199999,
+ 211060,
+ 222522,
+ 234393,
+ 246681,
+ 259392,
+ 272535,
+ 286115,
+ 300140,
+ 314618,
+ 329555,
+ 344960,
+ 360838,
+ 377197,
+ 394045,
+ 411388,
+ 429235,
+ 447591,
+ 466464,
+ 485862,
+ 505791,
+ 526260,
+ 547274,
+ 568841,
+ 590969,
+ 613664,
+ 636935,
+ 660787,
+ 685228,
+ 710266,
+ 735907,
+ 762160,
+ 789030,
+ 816525,
+ 844653,
+ 873420,
+ 902835,
+ 932903,
+ 963632,
+ 995030,
+ 1027103,
+ 1059860
+ ]
+ },
+ {
+ "name": "FAST",
+ "table": [
+ 0,
+ 0,
+ 6 ,
+ 21,
+ 51 ,
+ 100,
+ 172,
+ 274,
+ 409,
+ 583,
+ 800 ,
+ 1064,
+ 1382,
+ 1757,
+ 2195,
+ 2700,
+ 3276,
+ 3930,
+ 4665,
+ 5487,
+ 6400,
+ 7408,
+ 8518,
+ 9733 ,
+ 11059,
+ 12500,
+ 14060,
+ 15746,
+ 17561,
+ 19511,
+ 21600,
+ 23832,
+ 26214,
+ 28749,
+ 31443,
+ 34300,
+ 37324,
+ 40522,
+ 43897,
+ 47455,
+ 51200,
+ 55136,
+ 59270,
+ 63605,
+ 68147,
+ 72900,
+ 77868,
+ 83058,
+ 88473,
+ 94119 ,
+ 100000,
+ 106120,
+ 112486,
+ 119101,
+ 125971,
+ 133100,
+ 140492,
+ 148154,
+ 156089,
+ 164303,
+ 172800,
+ 181584,
+ 190662,
+ 200037,
+ 209715,
+ 219700,
+ 229996,
+ 240610,
+ 251545,
+ 262807,
+ 274400,
+ 286328,
+ 298598,
+ 311213,
+ 324179,
+ 337500,
+ 351180,
+ 365226,
+ 379641,
+ 394431,
+ 409600,
+ 425152,
+ 441094,
+ 457429,
+ 474163,
+ 491300,
+ 508844,
+ 526802,
+ 545177,
+ 563975,
+ 583200,
+ 602856,
+ 622950,
+ 643485,
+ 664467,
+ 685900,
+ 707788,
+ 730138,
+ 752953,
+ 776239,
+ 800000
+ ]
+ },
+ {
+ "name": "SLOW",
+ "table": [
+ 0,
+ 0,
+ 10,
+ 33,
+ 80,
+ 156,
+ 270,
+ 428,
+ 640,
+ 911,
+ 1250,
+ 1663,
+ 2160,
+ 2746,
+ 3430,
+ 4218,
+ 5120,
+ 6141,
+ 7290,
+ 8573,
+ 10000,
+ 11576,
+ 13310,
+ 15208,
+ 17280,
+ 19531,
+ 21970,
+ 24603,
+ 27440,
+ 30486,
+ 33750,
+ 37238,
+ 40960,
+ 44921,
+ 49130,
+ 53593,
+ 58320,
+ 63316,
+ 68590,
+ 74148,
+ 80000,
+ 86151,
+ 92610,
+ 99383,
+ 106480,
+ 113906,
+ 121670,
+ 129778,
+ 138240,
+ 147061,
+ 156250,
+ 165813,
+ 175760,
+ 186096,
+ 196830,
+ 207968,
+ 219520,
+ 231491,
+ 243890,
+ 256723,
+ 270000,
+ 283726,
+ 297910,
+ 312558,
+ 327680,
+ 343281,
+ 359370,
+ 375953,
+ 393040,
+ 410636,
+ 428750,
+ 447388,
+ 466560,
+ 486271,
+ 506530,
+ 527343,
+ 548720,
+ 570666,
+ 593190,
+ 616298,
+ 640000,
+ 664301,
+ 689210,
+ 714733,
+ 740880,
+ 767656,
+ 795070,
+ 823128,
+ 851840,
+ 881211,
+ 911250,
+ 941963,
+ 973360,
+ 1005446,
+ 1038230,
+ 1071718,
+ 1105920,
+ 1140841,
+ 1176490,
+ 1212873,
+ 1250000
+ ]
+ },
+ {
+ "name": "MEDIUM_FAST_2",
+ "table": [
+ 0,
+ 0,
+ 8,
+ 27,
+ 64,
+ 125,
+ 216,
+ 343,
+ 512,
+ 729,
+ 1000,
+ 1331,
+ 1728,
+ 2197,
+ 2744,
+ 3375,
+ 4096,
+ 4913,
+ 5832,
+ 6859,
+ 8000,
+ 9261,
+ 10648,
+ 12167,
+ 13824,
+ 15625,
+ 17576,
+ 19683,
+ 21952,
+ 24389,
+ 27000,
+ 29791,
+ 32768,
+ 35937,
+ 39304,
+ 42875,
+ 46656,
+ 50653,
+ 54872,
+ 59319,
+ 64000,
+ 68921,
+ 74088,
+ 79507,
+ 85184,
+ 91125,
+ 97336,
+ 103823,
+ 110592,
+ 117649,
+ 125000,
+ 132651,
+ 140608,
+ 148877,
+ 157464,
+ 166375,
+ 175616,
+ 185193,
+ 195112,
+ 205379,
+ 216000,
+ 226981,
+ 238328,
+ 250047,
+ 262144,
+ 274625,
+ 287496,
+ 300763,
+ 314432,
+ 328509,
+ 343000,
+ 357911,
+ 373248,
+ 389017,
+ 405224,
+ 421875,
+ 438976,
+ 456533,
+ 474552,
+ 493039,
+ 512000,
+ 531441,
+ 551368,
+ 571787,
+ 592704,
+ 614125,
+ 636056,
+ 658503,
+ 681472,
+ 704969,
+ 729000,
+ 753571,
+ 778688,
+ 804357,
+ 830584,
+ 857375,
+ 884736,
+ 912673,
+ 941192,
+ 970299,
+ 1000000
+ ]
+ },
+ {
+ "name": "MEDIUM_FAST_3",
+ "table": [
+ 0,
+ 0,
+ 8,
+ 27,
+ 64,
+ 125,
+ 216,
+ 343,
+ 512,
+ 729,
+ 1000,
+ 1331,
+ 1728,
+ 2197,
+ 2744,
+ 3375,
+ 4096,
+ 4913,
+ 5832,
+ 6859,
+ 8000,
+ 9261,
+ 10648,
+ 12167,
+ 13824,
+ 15625,
+ 17576,
+ 19683,
+ 21952,
+ 24389,
+ 27000,
+ 29791,
+ 32768,
+ 35937,
+ 39304,
+ 42875,
+ 46656,
+ 50653,
+ 54872,
+ 59319,
+ 64000,
+ 68921,
+ 74088,
+ 79507,
+ 85184,
+ 91125,
+ 97336,
+ 103823,
+ 110592,
+ 117649,
+ 125000,
+ 132651,
+ 140608,
+ 148877,
+ 157464,
+ 166375,
+ 175616,
+ 185193,
+ 195112,
+ 205379,
+ 216000,
+ 226981,
+ 238328,
+ 250047,
+ 262144,
+ 274625,
+ 287496,
+ 300763,
+ 314432,
+ 328509,
+ 343000,
+ 357911,
+ 373248,
+ 389017,
+ 405224,
+ 421875,
+ 438976,
+ 456533,
+ 474552,
+ 493039,
+ 512000,
+ 531441,
+ 551368,
+ 571787,
+ 592704,
+ 614125,
+ 636056,
+ 658503,
+ 681472,
+ 704969,
+ 729000,
+ 753571,
+ 778688,
+ 804357,
+ 830584,
+ 857375,
+ 884736,
+ 912673,
+ 941192,
+ 970299,
+ 1000000
+ ]
+ }
+ ]
+}
diff --git a/files/poketool/personal/growtbl.json.txt b/files/poketool/personal/growtbl.json.txt
new file mode 100644
index 00000000..45b248a5
--- /dev/null
+++ b/files/poketool/personal/growtbl.json.txt
@@ -0,0 +1,12 @@
+{{ doNotModifyHeader }}
+
+#include "global.h"
+
+u32 __size = 101 * sizeof(u32);
+
+const u32 growtbl[][101] = {
+## for tbl in growtbl
+ // {{ tbl.name }}
+ { {% for x in tbl.table %}{{ x }},{% endfor %} },
+## endfor
+};
diff --git a/files/poketool/personal/growtbl/.gitignore b/files/poketool/personal/growtbl/.gitignore
deleted file mode 100644
index 3eb611a0..00000000
--- a/files/poketool/personal/growtbl/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-grow2bin
-narc_*.bin
diff --git a/files/poketool/personal/growtbl/.knarcignore b/files/poketool/personal/growtbl/.knarcignore
deleted file mode 100644
index d633d071..00000000
--- a/files/poketool/personal/growtbl/.knarcignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.txt
-*.exe
-grow2bin
diff --git a/files/poketool/personal/growtbl/narc_0000.txt b/files/poketool/personal/growtbl/narc_0000.txt
deleted file mode 100644
index 24a29a0f..00000000
--- a/files/poketool/personal/growtbl/narc_0000.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-8
-27
-64
-125
-216
-343
-512
-729
-1000
-1331
-1728
-2197
-2744
-3375
-4096
-4913
-5832
-6859
-8000
-9261
-10648
-12167
-13824
-15625
-17576
-19683
-21952
-24389
-27000
-29791
-32768
-35937
-39304
-42875
-46656
-50653
-54872
-59319
-64000
-68921
-74088
-79507
-85184
-91125
-97336
-103823
-110592
-117649
-125000
-132651
-140608
-148877
-157464
-166375
-175616
-185193
-195112
-205379
-216000
-226981
-238328
-250047
-262144
-274625
-287496
-300763
-314432
-328509
-343000
-357911
-373248
-389017
-405224
-421875
-438976
-456533
-474552
-493039
-512000
-531441
-551368
-571787
-592704
-614125
-636056
-658503
-681472
-704969
-729000
-753571
-778688
-804357
-830584
-857375
-884736
-912673
-941192
-970299
-1000000
diff --git a/files/poketool/personal/growtbl/narc_0001.txt b/files/poketool/personal/growtbl/narc_0001.txt
deleted file mode 100644
index b12ec561..00000000
--- a/files/poketool/personal/growtbl/narc_0001.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-15
-52
-122
-237
-406
-637
-942
-1326
-1800
-2369
-3041
-3822
-4719
-5737
-6881
-8155
-9564
-11111
-12800
-14632
-16610
-18737
-21012
-23437
-26012
-28737
-31610
-34632
-37800
-41111
-44564
-48155
-51881
-55737
-59719
-63822
-68041
-72369
-76800
-81326
-85942
-90637
-95406
-100237
-105122
-110052
-115015
-120001
-125000
-131324
-137795
-144410
-151165
-158056
-165079
-172229
-179503
-186894
-194400
-202013
-209728
-217540
-225443
-233431
-241496
-249633
-257834
-267406
-276458
-286328
-296358
-305767
-316074
-326531
-336255
-346965
-357812
-367807
-378880
-390077
-400293
-411686
-423190
-433572
-445239
-457001
-467489
-479378
-491346
-501878
-513934
-526049
-536557
-548720
-560922
-571333
-583539
-591882
-600000
diff --git a/files/poketool/personal/growtbl/narc_0002.txt b/files/poketool/personal/growtbl/narc_0002.txt
deleted file mode 100644
index be1dba64..00000000
--- a/files/poketool/personal/growtbl/narc_0002.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-4
-13
-32
-65
-112
-178
-276
-393
-540
-745
-967
-1230
-1591
-1957
-2457
-3046
-3732
-4526
-5440
-6482
-7666
-9003
-10506
-12187
-14060
-16140
-18439
-20974
-23760
-26811
-30146
-33780
-37731
-42017
-46656
-50653
-55969
-60505
-66560
-71677
-78533
-84277
-91998
-98415
-107069
-114205
-123863
-131766
-142500
-151222
-163105
-172697
-185807
-196322
-210739
-222231
-238036
-250562
-267840
-281456
-300293
-315059
-335544
-351520
-373744
-390991
-415050
-433631
-459620
-479600
-507617
-529063
-559209
-582187
-614566
-639146
-673863
-700115
-737280
-765275
-804997
-834809
-877201
-908905
-954084
-987754
-1035837
-1071552
-1122660
-1160499
-1214753
-1254796
-1312322
-1354652
-1415577
-1460276
-1524731
-1571884
-1640000
diff --git a/files/poketool/personal/growtbl/narc_0003.txt b/files/poketool/personal/growtbl/narc_0003.txt
deleted file mode 100644
index eff71429..00000000
--- a/files/poketool/personal/growtbl/narc_0003.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-9
-57
-96
-135
-179
-236
-314
-419
-560
-742
-973
-1261
-1612
-2035
-2535
-3120
-3798
-4575
-5460
-6458
-7577
-8825
-10208
-11735
-13411
-15244
-17242
-19411
-21760
-24294
-27021
-29949
-33084
-36435
-40007
-43808
-47846
-52127
-56660
-61450
-66505
-71833
-77440
-83335
-89523
-96012
-102810
-109923
-117360
-125126
-133229
-141677
-150476
-159635
-169159
-179056
-189334
-199999
-211060
-222522
-234393
-246681
-259392
-272535
-286115
-300140
-314618
-329555
-344960
-360838
-377197
-394045
-411388
-429235
-447591
-466464
-485862
-505791
-526260
-547274
-568841
-590969
-613664
-636935
-660787
-685228
-710266
-735907
-762160
-789030
-816525
-844653
-873420
-902835
-932903
-963632
-995030
-1027103
-1059860
diff --git a/files/poketool/personal/growtbl/narc_0004.txt b/files/poketool/personal/growtbl/narc_0004.txt
deleted file mode 100644
index 47bb6f6c..00000000
--- a/files/poketool/personal/growtbl/narc_0004.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-6
-21
-51
-100
-172
-274
-409
-583
-800
-1064
-1382
-1757
-2195
-2700
-3276
-3930
-4665
-5487
-6400
-7408
-8518
-9733
-11059
-12500
-14060
-15746
-17561
-19511
-21600
-23832
-26214
-28749
-31443
-34300
-37324
-40522
-43897
-47455
-51200
-55136
-59270
-63605
-68147
-72900
-77868
-83058
-88473
-94119
-100000
-106120
-112486
-119101
-125971
-133100
-140492
-148154
-156089
-164303
-172800
-181584
-190662
-200037
-209715
-219700
-229996
-240610
-251545
-262807
-274400
-286328
-298598
-311213
-324179
-337500
-351180
-365226
-379641
-394431
-409600
-425152
-441094
-457429
-474163
-491300
-508844
-526802
-545177
-563975
-583200
-602856
-622950
-643485
-664467
-685900
-707788
-730138
-752953
-776239
-800000
diff --git a/files/poketool/personal/growtbl/narc_0005.txt b/files/poketool/personal/growtbl/narc_0005.txt
deleted file mode 100644
index 0dc0f8f7..00000000
--- a/files/poketool/personal/growtbl/narc_0005.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-10
-33
-80
-156
-270
-428
-640
-911
-1250
-1663
-2160
-2746
-3430
-4218
-5120
-6141
-7290
-8573
-10000
-11576
-13310
-15208
-17280
-19531
-21970
-24603
-27440
-30486
-33750
-37238
-40960
-44921
-49130
-53593
-58320
-63316
-68590
-74148
-80000
-86151
-92610
-99383
-106480
-113906
-121670
-129778
-138240
-147061
-156250
-165813
-175760
-186096
-196830
-207968
-219520
-231491
-243890
-256723
-270000
-283726
-297910
-312558
-327680
-343281
-359370
-375953
-393040
-410636
-428750
-447388
-466560
-486271
-506530
-527343
-548720
-570666
-593190
-616298
-640000
-664301
-689210
-714733
-740880
-767656
-795070
-823128
-851840
-881211
-911250
-941963
-973360
-1005446
-1038230
-1071718
-1105920
-1140841
-1176490
-1212873
-1250000
diff --git a/files/poketool/personal/growtbl/narc_0006.txt b/files/poketool/personal/growtbl/narc_0006.txt
deleted file mode 100644
index 24a29a0f..00000000
--- a/files/poketool/personal/growtbl/narc_0006.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-8
-27
-64
-125
-216
-343
-512
-729
-1000
-1331
-1728
-2197
-2744
-3375
-4096
-4913
-5832
-6859
-8000
-9261
-10648
-12167
-13824
-15625
-17576
-19683
-21952
-24389
-27000
-29791
-32768
-35937
-39304
-42875
-46656
-50653
-54872
-59319
-64000
-68921
-74088
-79507
-85184
-91125
-97336
-103823
-110592
-117649
-125000
-132651
-140608
-148877
-157464
-166375
-175616
-185193
-195112
-205379
-216000
-226981
-238328
-250047
-262144
-274625
-287496
-300763
-314432
-328509
-343000
-357911
-373248
-389017
-405224
-421875
-438976
-456533
-474552
-493039
-512000
-531441
-551368
-571787
-592704
-614125
-636056
-658503
-681472
-704969
-729000
-753571
-778688
-804357
-830584
-857375
-884736
-912673
-941192
-970299
-1000000
diff --git a/files/poketool/personal/growtbl/narc_0007.txt b/files/poketool/personal/growtbl/narc_0007.txt
deleted file mode 100644
index 24a29a0f..00000000
--- a/files/poketool/personal/growtbl/narc_0007.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-0
-0
-8
-27
-64
-125
-216
-343
-512
-729
-1000
-1331
-1728
-2197
-2744
-3375
-4096
-4913
-5832
-6859
-8000
-9261
-10648
-12167
-13824
-15625
-17576
-19683
-21952
-24389
-27000
-29791
-32768
-35937
-39304
-42875
-46656
-50653
-54872
-59319
-64000
-68921
-74088
-79507
-85184
-91125
-97336
-103823
-110592
-117649
-125000
-132651
-140608
-148877
-157464
-166375
-175616
-185193
-195112
-205379
-216000
-226981
-238328
-250047
-262144
-274625
-287496
-300763
-314432
-328509
-343000
-357911
-373248
-389017
-405224
-421875
-438976
-456533
-474552
-493039
-512000
-531441
-551368
-571787
-592704
-614125
-636056
-658503
-681472
-704969
-729000
-753571
-778688
-804357
-830584
-857375
-884736
-912673
-941192
-970299
-1000000
diff --git a/files/poketool/personal/pms.json b/files/poketool/personal/pms.json
new file mode 100644
index 00000000..07003ed9
--- /dev/null
+++ b/files/poketool/personal/pms.json
@@ -0,0 +1,505 @@
+{
+ "pms": [
+ "NONE",
+ "BULBASAUR",
+ "BULBASAUR",
+ "BULBASAUR",
+ "CHARMANDER",
+ "CHARMANDER",
+ "CHARMANDER",
+ "SQUIRTLE",
+ "SQUIRTLE",
+ "SQUIRTLE",
+ "CATERPIE",
+ "CATERPIE",
+ "CATERPIE",
+ "WEEDLE",
+ "WEEDLE",
+ "WEEDLE",
+ "PIDGEY",
+ "PIDGEY",
+ "PIDGEY",
+ "RATTATA",
+ "RATTATA",
+ "SPEAROW",
+ "SPEAROW",
+ "EKANS",
+ "EKANS",
+ "PICHU",
+ "PICHU",
+ "SANDSHREW",
+ "SANDSHREW",
+ "NIDORAN_F",
+ "NIDORAN_F",
+ "NIDORAN_F",
+ "NIDORAN_M",
+ "NIDORAN_M",
+ "NIDORAN_M",
+ "CLEFFA",
+ "CLEFFA",
+ "VULPIX",
+ "VULPIX",
+ "IGGLYBUFF",
+ "IGGLYBUFF",
+ "ZUBAT",
+ "ZUBAT",
+ "ODDISH",
+ "ODDISH",
+ "ODDISH",
+ "PARAS",
+ "PARAS",
+ "VENONAT",
+ "VENONAT",
+ "DIGLETT",
+ "DIGLETT",
+ "MEOWTH",
+ "MEOWTH",
+ "PSYDUCK",
+ "PSYDUCK",
+ "MANKEY",
+ "MANKEY",
+ "GROWLITHE",
+ "GROWLITHE",
+ "POLIWAG",
+ "POLIWAG",
+ "POLIWAG",
+ "ABRA",
+ "ABRA",
+ "ABRA",
+ "MACHOP",
+ "MACHOP",
+ "MACHOP",
+ "BELLSPROUT",
+ "BELLSPROUT",
+ "BELLSPROUT",
+ "TENTACOOL",
+ "TENTACOOL",
+ "GEODUDE",
+ "GEODUDE",
+ "GEODUDE",
+ "PONYTA",
+ "PONYTA",
+ "SLOWPOKE",
+ "SLOWPOKE",
+ "MAGNEMITE",
+ "MAGNEMITE",
+ "FARFETCHD",
+ "DODUO",
+ "DODUO",
+ "SEEL",
+ "SEEL",
+ "GRIMER",
+ "GRIMER",
+ "SHELLDER",
+ "SHELLDER",
+ "GASTLY",
+ "GASTLY",
+ "GASTLY",
+ "ONIX",
+ "DROWZEE",
+ "DROWZEE",
+ "KRABBY",
+ "KRABBY",
+ "VOLTORB",
+ "VOLTORB",
+ "EXEGGCUTE",
+ "EXEGGCUTE",
+ "CUBONE",
+ "CUBONE",
+ "TYROGUE",
+ "TYROGUE",
+ "LICKITUNG",
+ "KOFFING",
+ "KOFFING",
+ "RHYHORN",
+ "RHYHORN",
+ "HAPPINY",
+ "TANGELA",
+ "KANGASKHAN",
+ "HORSEA",
+ "HORSEA",
+ "GOLDEEN",
+ "GOLDEEN",
+ "STARYU",
+ "STARYU",
+ "MIME_JR",
+ "SCYTHER",
+ "SMOOCHUM",
+ "ELEKID",
+ "MAGBY",
+ "PINSIR",
+ "TAUROS",
+ "MAGIKARP",
+ "MAGIKARP",
+ "LAPRAS",
+ "DITTO",
+ "EEVEE",
+ "EEVEE",
+ "EEVEE",
+ "EEVEE",
+ "PORYGON",
+ "OMANYTE",
+ "OMANYTE",
+ "KABUTO",
+ "KABUTO",
+ "AERODACTYL",
+ "MUNCHLAX",
+ "ARTICUNO",
+ "ZAPDOS",
+ "MOLTRES",
+ "DRATINI",
+ "DRATINI",
+ "DRATINI",
+ "MEWTWO",
+ "MEW",
+ "CHIKORITA",
+ "CHIKORITA",
+ "CHIKORITA",
+ "CYNDAQUIL",
+ "CYNDAQUIL",
+ "CYNDAQUIL",
+ "TOTODILE",
+ "TOTODILE",
+ "TOTODILE",
+ "SENTRET",
+ "SENTRET",
+ "HOOTHOOT",
+ "HOOTHOOT",
+ "LEDYBA",
+ "LEDYBA",
+ "SPINARAK",
+ "SPINARAK",
+ "ZUBAT",
+ "CHINCHOU",
+ "CHINCHOU",
+ "PICHU",
+ "CLEFFA",
+ "IGGLYBUFF",
+ "TOGEPI",
+ "TOGEPI",
+ "NATU",
+ "NATU",
+ "MAREEP",
+ "MAREEP",
+ "MAREEP",
+ "ODDISH",
+ "AZURILL",
+ "AZURILL",
+ "BONSLY",
+ "POLIWAG",
+ "HOPPIP",
+ "HOPPIP",
+ "HOPPIP",
+ "AIPOM",
+ "SUNKERN",
+ "SUNKERN",
+ "YANMA",
+ "WOOPER",
+ "WOOPER",
+ "EEVEE",
+ "EEVEE",
+ "MURKROW",
+ "SLOWPOKE",
+ "MISDREAVUS",
+ "UNOWN",
+ "WYNAUT",
+ "GIRAFARIG",
+ "PINECO",
+ "PINECO",
+ "DUNSPARCE",
+ "GLIGAR",
+ "ONIX",
+ "SNUBBULL",
+ "SNUBBULL",
+ "QWILFISH",
+ "SCYTHER",
+ "SHUCKLE",
+ "HERACROSS",
+ "SNEASEL",
+ "TEDDIURSA",
+ "TEDDIURSA",
+ "SLUGMA",
+ "SLUGMA",
+ "SWINUB",
+ "SWINUB",
+ "CORSOLA",
+ "REMORAID",
+ "REMORAID",
+ "DELIBIRD",
+ "MANTYKE",
+ "SKARMORY",
+ "HOUNDOUR",
+ "HOUNDOUR",
+ "HORSEA",
+ "PHANPY",
+ "PHANPY",
+ "PORYGON",
+ "STANTLER",
+ "SMEARGLE",
+ "TYROGUE",
+ "TYROGUE",
+ "SMOOCHUM",
+ "ELEKID",
+ "MAGBY",
+ "MILTANK",
+ "HAPPINY",
+ "RAIKOU",
+ "ENTEI",
+ "SUICUNE",
+ "LARVITAR",
+ "LARVITAR",
+ "LARVITAR",
+ "LUGIA",
+ "HO_OH",
+ "CELEBI",
+ "TREECKO",
+ "TREECKO",
+ "TREECKO",
+ "TORCHIC",
+ "TORCHIC",
+ "TORCHIC",
+ "MUDKIP",
+ "MUDKIP",
+ "MUDKIP",
+ "POOCHYENA",
+ "POOCHYENA",
+ "ZIGZAGOON",
+ "ZIGZAGOON",
+ "WURMPLE",
+ "WURMPLE",
+ "WURMPLE",
+ "WURMPLE",
+ "WURMPLE",
+ "LOTAD",
+ "LOTAD",
+ "LOTAD",
+ "SEEDOT",
+ "SEEDOT",
+ "SEEDOT",
+ "TAILLOW",
+ "TAILLOW",
+ "WINGULL",
+ "WINGULL",
+ "RALTS",
+ "RALTS",
+ "RALTS",
+ "SURSKIT",
+ "SURSKIT",
+ "SHROOMISH",
+ "SHROOMISH",
+ "SLAKOTH",
+ "SLAKOTH",
+ "SLAKOTH",
+ "NINCADA",
+ "NINCADA",
+ "NINCADA",
+ "WHISMUR",
+ "WHISMUR",
+ "WHISMUR",
+ "MAKUHITA",
+ "MAKUHITA",
+ "AZURILL",
+ "NOSEPASS",
+ "SKITTY",
+ "SKITTY",
+ "SABLEYE",
+ "MAWILE",
+ "ARON",
+ "ARON",
+ "ARON",
+ "MEDITITE",
+ "MEDITITE",
+ "ELECTRIKE",
+ "ELECTRIKE",
+ "PLUSLE",
+ "MINUN",
+ "VOLBEAT",
+ "ILLUMISE",
+ "BUDEW",
+ "GULPIN",
+ "GULPIN",
+ "CARVANHA",
+ "CARVANHA",
+ "WAILMER",
+ "WAILMER",
+ "NUMEL",
+ "NUMEL",
+ "TORKOAL",
+ "SPOINK",
+ "SPOINK",
+ "SPINDA",
+ "TRAPINCH",
+ "TRAPINCH",
+ "TRAPINCH",
+ "CACNEA",
+ "CACNEA",
+ "SWABLU",
+ "SWABLU",
+ "ZANGOOSE",
+ "SEVIPER",
+ "LUNATONE",
+ "SOLROCK",
+ "BARBOACH",
+ "BARBOACH",
+ "CORPHISH",
+ "CORPHISH",
+ "BALTOY",
+ "BALTOY",
+ "LILEEP",
+ "LILEEP",
+ "ANORITH",
+ "ANORITH",
+ "FEEBAS",
+ "FEEBAS",
+ "CASTFORM",
+ "KECLEON",
+ "SHUPPET",
+ "SHUPPET",
+ "DUSKULL",
+ "DUSKULL",
+ "TROPIUS",
+ "CHINGLING",
+ "ABSOL",
+ "WYNAUT",
+ "SNORUNT",
+ "SNORUNT",
+ "SPHEAL",
+ "SPHEAL",
+ "SPHEAL",
+ "CLAMPERL",
+ "CLAMPERL",
+ "CLAMPERL",
+ "RELICANTH",
+ "LUVDISC",
+ "BAGON",
+ "BAGON",
+ "BAGON",
+ "BELDUM",
+ "BELDUM",
+ "BELDUM",
+ "REGIROCK",
+ "REGICE",
+ "REGISTEEL",
+ "LATIAS",
+ "LATIOS",
+ "KYOGRE",
+ "GROUDON",
+ "RAYQUAZA",
+ "JIRACHI",
+ "DEOXYS",
+ "TURTWIG",
+ "TURTWIG",
+ "TURTWIG",
+ "CHIMCHAR",
+ "CHIMCHAR",
+ "CHIMCHAR",
+ "PIPLUP",
+ "PIPLUP",
+ "PIPLUP",
+ "STARLY",
+ "STARLY",
+ "STARLY",
+ "BIDOOF",
+ "BIDOOF",
+ "KRICKETOT",
+ "KRICKETOT",
+ "SHINX",
+ "SHINX",
+ "SHINX",
+ "BUDEW",
+ "BUDEW",
+ "CRANIDOS",
+ "CRANIDOS",
+ "SHIELDON",
+ "SHIELDON",
+ "BURMY",
+ "BURMY",
+ "BURMY",
+ "COMBEE",
+ "COMBEE",
+ "PACHIRISU",
+ "BUIZEL",
+ "BUIZEL",
+ "CHERUBI",
+ "CHERUBI",
+ "SHELLOS",
+ "SHELLOS",
+ "AIPOM",
+ "DRIFLOON",
+ "DRIFLOON",
+ "BUNEARY",
+ "BUNEARY",
+ "MISDREAVUS",
+ "MURKROW",
+ "GLAMEOW",
+ "GLAMEOW",
+ "CHINGLING",
+ "STUNKY",
+ "STUNKY",
+ "BRONZOR",
+ "BRONZOR",
+ "BONSLY",
+ "MIME_JR",
+ "HAPPINY",
+ "CHATOT",
+ "SPIRITOMB",
+ "GIBLE",
+ "GIBLE",
+ "GIBLE",
+ "MUNCHLAX",
+ "RIOLU",
+ "RIOLU",
+ "HIPPOPOTAS",
+ "HIPPOPOTAS",
+ "SKORUPI",
+ "SKORUPI",
+ "CROAGUNK",
+ "CROAGUNK",
+ "CARNIVINE",
+ "FINNEON",
+ "FINNEON",
+ "MANTYKE",
+ "SNOVER",
+ "SNOVER",
+ "SNEASEL",
+ "MAGNEMITE",
+ "LICKITUNG",
+ "RHYHORN",
+ "TANGELA",
+ "ELEKID",
+ "MAGBY",
+ "TOGEPI",
+ "YANMA",
+ "EEVEE",
+ "EEVEE",
+ "GLIGAR",
+ "SWINUB",
+ "PORYGON",
+ "RALTS",
+ "NOSEPASS",
+ "DUSKULL",
+ "SNORUNT",
+ "ROTOM",
+ "UXIE",
+ "MESPRIT",
+ "AZELF",
+ "DIALGA",
+ "PALKIA",
+ "HEATRAN",
+ "REGIGIGAS",
+ "GIRATINA",
+ "CRESSELIA",
+ "PHIONE",
+ "MANAPHY",
+ "DARKRAI",
+ "SHAYMIN",
+ "ARCEUS",
+ "EGG",
+ "MANAPHY_EGG",
+ "DEOXYS_ATK",
+ "DEOXYS_DEF",
+ "DEOXYS_SPD",
+ "WORMADAM_SANDY",
+ "WORMADAM_TRASH"
+ ]
+}
diff --git a/files/poketool/personal/pms.json.txt b/files/poketool/personal/pms.json.txt
new file mode 100644
index 00000000..f9067903
--- /dev/null
+++ b/files/poketool/personal/pms.json.txt
@@ -0,0 +1,8 @@
+{{ doNotModifyHeader }}
+
+#include "global.h"
+#include "constants/species.h"
+
+const u16 pms[] = {
+ {% for pm in pms %}SPECIES_{{ pm }},{% endfor %}
+};
diff --git a/files/poketool/personal/pms.narc b/files/poketool/personal/pms.narc
deleted file mode 100644
index 97b69ced..00000000
--- a/files/poketool/personal/pms.narc
+++ /dev/null
Binary files differ
diff --git a/filesystem.mk b/filesystem.mk
index 8b588d58..05098980 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -280,19 +280,17 @@ HOSTFS_FILES = $(NITROFS_FILES:%=files/%)
%.arc:
$(KNARC) -d $(basename $@)/ -p $@
-files/poketool/personal/pms.narc: ;
-
O2NARC_TARGETS := \
files/poketool/personal/personal.narc \
files/poketool/personal/wotbl.narc \
files/poketool/personal/evo.narc \
+ files/poketool/personal/growtbl.narc \
+ files/poketool/personal/pms.narc \
+
+files/poketool/personal/pms.narc: O2NARCFLAGS = -f
$(O2NARC_TARGETS): %.narc: %.json %.json.txt
$(JSONPROC) $^ $*.c
$(CC) $(CFLAGS) -c -o $*.o $*.c
- $(O2NARC) $*.o $@
+ $(O2NARC) $(O2NARCFLAGS) $*.o $@
@$(RM) $*.o $*.c
-
-files/poketool/personal/growtbl.narc: $(wildcard files/poketool/personal/growtbl/*.txt)
- $(foreach file,$^,$(CSV2BIN) $(file);)
- $(KNARC) -d $(basename $@)/ -p $@
diff --git a/tools/o2narc/o2narc.cpp b/tools/o2narc/o2narc.cpp
index e4b46e2a..0a93df80 100644
--- a/tools/o2narc/o2narc.cpp
+++ b/tools/o2narc/o2narc.cpp
@@ -309,7 +309,11 @@ int main(int argc, char ** argv) {
delete[] _data;
}
// NARC members are contiguous in memory
- ofile.write(_rodata, (rodata_sec.sh_size + 3) & ~3);
+ ofile.write(_rodata, rodata_sec.sh_size);
+ if (!flatten && (rodata_sec.sh_size & 3)) {
+ for (int i = rodata_sec.sh_size & 3; i < 4; i++)
+ ofile.put(padding);
+ }
// Cleanup
delete[] _rodata;
ofile.close();