summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRevo <projectrevotpp@hotmail.com>2021-07-03 10:16:25 -0400
committerGitHub <noreply@github.com>2021-07-03 10:16:25 -0400
commitd4f8b27e68394275cd24a0c5b4584ebc39bdb1a1 (patch)
tree71250d47174bd41ff1dc82083178c545bd42eb8e
parent8f7c115c0e110aa50a5c81b9a8f7dec31760fa67 (diff)
parent6a219f1a0db892a79d368b91ff9b3aed5f4c0f18 (diff)
Merge pull request #425 from tgsm/trial
Process `files/resource/eng/trial/trial.narc`
-rw-r--r--files/resource/eng/trial/trial/.gitignore8
-rw-r--r--files/resource/eng/trial/trial/.knarcignore1
-rw-r--r--files/resource/eng/trial/trial/narc_0000.NCLRbin552 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0000.pal19
-rw-r--r--files/resource/eng/trial/trial/narc_0001.NCGRbin24640 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0001.pngbin0 -> 1652 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0002.NSCRbin2084 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0002_map.json32
-rw-r--r--files/resource/eng/trial/trial/narc_0002_tileset.json14
-rw-r--r--files/resource/eng/trial/trial/narc_0003.NCLRbin552 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0003.pal19
-rw-r--r--files/resource/eng/trial/trial/narc_0004.NCGRbin24640 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0004.pngbin0 -> 2095 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0005.NSCRbin2084 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0005_map.json32
-rw-r--r--files/resource/eng/trial/trial/narc_0005_tileset.json14
-rw-r--r--files/resource/eng/trial/trial/narc_0006.NCLRbin552 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0006.pal19
-rw-r--r--files/resource/eng/trial/trial/narc_0007.NCGRbin1072 -> 0 bytes
-rw-r--r--files/resource/eng/trial/trial/narc_0007.pngbin0 -> 376 bytes
-rw-r--r--filesystem.mk10
-rw-r--r--graphics_rules.mk23
22 files changed, 186 insertions, 5 deletions
diff --git a/files/resource/eng/trial/trial/.gitignore b/files/resource/eng/trial/trial/.gitignore
new file mode 100644
index 00000000..41816fbf
--- /dev/null
+++ b/files/resource/eng/trial/trial/.gitignore
@@ -0,0 +1,8 @@
+narc_0000.NCLR
+narc_0001.NCGR
+narc_0002.NSCR
+narc_0003.NCLR
+narc_0004.NCGR
+narc_0005.NSCR
+narc_0006.NCLR
+narc_0007.NCGR
diff --git a/files/resource/eng/trial/trial/.knarcignore b/files/resource/eng/trial/trial/.knarcignore
index 2856080a..ebdff6e6 100644
--- a/files/resource/eng/trial/trial/.knarcignore
+++ b/files/resource/eng/trial/trial/.knarcignore
@@ -1,2 +1,3 @@
*.png
*.pal
+*.json
diff --git a/files/resource/eng/trial/trial/narc_0000.NCLR b/files/resource/eng/trial/trial/narc_0000.NCLR
deleted file mode 100644
index 5f80ebcb..00000000
--- a/files/resource/eng/trial/trial/narc_0000.NCLR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0000.pal b/files/resource/eng/trial/trial/narc_0000.pal
new file mode 100644
index 00000000..12de63af
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0000.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+255 222 0
+255 255 255
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/resource/eng/trial/trial/narc_0001.NCGR b/files/resource/eng/trial/trial/narc_0001.NCGR
deleted file mode 100644
index 3bd9894e..00000000
--- a/files/resource/eng/trial/trial/narc_0001.NCGR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0001.png b/files/resource/eng/trial/trial/narc_0001.png
new file mode 100644
index 00000000..001fffe4
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0001.png
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0002.NSCR b/files/resource/eng/trial/trial/narc_0002.NSCR
deleted file mode 100644
index 73e2bb51..00000000
--- a/files/resource/eng/trial/trial/narc_0002.NSCR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0002_map.json b/files/resource/eng/trial/trial/narc_0002_map.json
new file mode 100644
index 00000000..f29ca09e
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0002_map.json
@@ -0,0 +1,32 @@
+{ "compressionlevel":-1,
+ "height":32,
+ "infinite":false,
+ "layers":[
+ {
+ "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+ "height":32,
+ "id":1,
+ "name":"Tile Layer 1",
+ "opacity":1,
+ "type":"tilelayer",
+ "visible":true,
+ "width":32,
+ "x":0,
+ "y":0
+ }],
+ "nextlayerid":2,
+ "nextobjectid":1,
+ "orientation":"orthogonal",
+ "renderorder":"right-down",
+ "tiledversion":"1.7.0",
+ "tileheight":8,
+ "tilesets":[
+ {
+ "firstgid":1,
+ "source":"narc_0002_tileset.json"
+ }],
+ "tilewidth":8,
+ "type":"map",
+ "version":"1.6",
+ "width":32
+} \ No newline at end of file
diff --git a/files/resource/eng/trial/trial/narc_0002_tileset.json b/files/resource/eng/trial/trial/narc_0002_tileset.json
new file mode 100644
index 00000000..8017cfa2
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0002_tileset.json
@@ -0,0 +1,14 @@
+{ "columns":32,
+ "image":"narc_0001.png",
+ "imageheight":192,
+ "imagewidth":256,
+ "margin":0,
+ "name":"narc_0001",
+ "spacing":0,
+ "tilecount":768,
+ "tiledversion":"1.7.0",
+ "tileheight":8,
+ "tilewidth":8,
+ "type":"tileset",
+ "version":"1.6"
+} \ No newline at end of file
diff --git a/files/resource/eng/trial/trial/narc_0003.NCLR b/files/resource/eng/trial/trial/narc_0003.NCLR
deleted file mode 100644
index fd75cd98..00000000
--- a/files/resource/eng/trial/trial/narc_0003.NCLR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0003.pal b/files/resource/eng/trial/trial/narc_0003.pal
new file mode 100644
index 00000000..c88938c8
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0003.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+8 0 0
+222 222 222
+41 41 41
+123 123 123
+172 172 172
+74 74 74
+255 255 255
+189 189 189
+98 98 98
+139 139 139
+57 49 49
+205 205 205
+156 156 156
+82 82 82
+180 180 180
diff --git a/files/resource/eng/trial/trial/narc_0004.NCGR b/files/resource/eng/trial/trial/narc_0004.NCGR
deleted file mode 100644
index ba25ad50..00000000
--- a/files/resource/eng/trial/trial/narc_0004.NCGR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0004.png b/files/resource/eng/trial/trial/narc_0004.png
new file mode 100644
index 00000000..2a7b1c9a
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0004.png
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0005.NSCR b/files/resource/eng/trial/trial/narc_0005.NSCR
deleted file mode 100644
index 73e2bb51..00000000
--- a/files/resource/eng/trial/trial/narc_0005.NSCR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0005_map.json b/files/resource/eng/trial/trial/narc_0005_map.json
new file mode 100644
index 00000000..f008e1a3
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0005_map.json
@@ -0,0 +1,32 @@
+{ "compressionlevel":-1,
+ "height":32,
+ "infinite":false,
+ "layers":[
+ {
+ "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+ "height":32,
+ "id":1,
+ "name":"Tile Layer 1",
+ "opacity":1,
+ "type":"tilelayer",
+ "visible":true,
+ "width":32,
+ "x":0,
+ "y":0
+ }],
+ "nextlayerid":2,
+ "nextobjectid":1,
+ "orientation":"orthogonal",
+ "renderorder":"right-down",
+ "tiledversion":"1.7.0",
+ "tileheight":8,
+ "tilesets":[
+ {
+ "firstgid":1,
+ "source":"narc_0005_tileset.json"
+ }],
+ "tilewidth":8,
+ "type":"map",
+ "version":"1.6",
+ "width":32
+} \ No newline at end of file
diff --git a/files/resource/eng/trial/trial/narc_0005_tileset.json b/files/resource/eng/trial/trial/narc_0005_tileset.json
new file mode 100644
index 00000000..8c815a25
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0005_tileset.json
@@ -0,0 +1,14 @@
+{ "columns":32,
+ "image":"narc_0004.png",
+ "imageheight":192,
+ "imagewidth":256,
+ "margin":0,
+ "name":"narc_0004",
+ "spacing":0,
+ "tilecount":768,
+ "tiledversion":"1.7.0",
+ "tileheight":8,
+ "tilewidth":8,
+ "type":"tileset",
+ "version":"1.6"
+} \ No newline at end of file
diff --git a/files/resource/eng/trial/trial/narc_0006.NCLR b/files/resource/eng/trial/trial/narc_0006.NCLR
deleted file mode 100644
index b022801d..00000000
--- a/files/resource/eng/trial/trial/narc_0006.NCLR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0006.pal b/files/resource/eng/trial/trial/narc_0006.pal
new file mode 100644
index 00000000..4974f67b
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0006.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 238 180
+255 213 115
+255 189 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/resource/eng/trial/trial/narc_0007.NCGR b/files/resource/eng/trial/trial/narc_0007.NCGR
deleted file mode 100644
index 170b6168..00000000
--- a/files/resource/eng/trial/trial/narc_0007.NCGR
+++ /dev/null
Binary files differ
diff --git a/files/resource/eng/trial/trial/narc_0007.png b/files/resource/eng/trial/trial/narc_0007.png
new file mode 100644
index 00000000..0274c915
--- /dev/null
+++ b/files/resource/eng/trial/trial/narc_0007.png
Binary files differ
diff --git a/filesystem.mk b/filesystem.mk
index ce072c9c..41cabe36 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -3266,6 +3266,16 @@ files/graphic/poketch.narc: \
files/graphic/poketch/narc_0010.NCGR.lz \
files/graphic/poketch/narc_0011.NSCR.lz
+files/resource/eng/trial/trial.narc: \
+ files/resource/eng/trial/trial/narc_0000.NCLR \
+ files/resource/eng/trial/trial/narc_0001.NCGR \
+ files/resource/eng/trial/trial/narc_0002.NSCR \
+ files/resource/eng/trial/trial/narc_0003.NCLR \
+ files/resource/eng/trial/trial/narc_0004.NCGR \
+ files/resource/eng/trial/trial/narc_0005.NSCR \
+ files/resource/eng/trial/trial/narc_0006.NCLR \
+ files/resource/eng/trial/trial/narc_0007.NCGR
+
## Trainer names
files/msgdata/msg/narc_0559.txt: files/poketool/trainer/trdata.json
(echo " -"; $(GREP) -w '"name":' $< | cut -d'"' -f4) | $(SED) 's/^(.+)$$/{TRNAME}\1\r/g' > $@
diff --git a/graphics_rules.mk b/graphics_rules.mk
index d36fa0c3..8bbbf8bb 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -111,11 +111,15 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
files/poketool/icongra/poke_icon/narc_0034.NCGR \
files/poketool/icongra/poke_icon/narc_0035.NCGR \
files/poketool/icongra/poke_icon/narc_0036.NCGR \
- files/poketool/icongra/poke_icon/narc_0402.NCGR
+ files/poketool/icongra/poke_icon/narc_0402.NCGR \
+ files/resource/eng/trial/trial/narc_0007.NCGR
4BPP_NCLR_FILES := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \
files/demo/title/titledemo/narc_0016.NCLR \
- files/poketool/icongra/poke_icon/narc_0000.NCLR
+ files/poketool/icongra/poke_icon/narc_0000.NCLR \
+ files/resource/eng/trial/trial/narc_0000.NCLR \
+ files/resource/eng/trial/trial/narc_0003.NCLR \
+ files/resource/eng/trial/trial/narc_0006.NCLR \
8BPP_NSCR_FILES := files/demo/title/titledemo/narc_0000.NSCR
@@ -157,7 +161,9 @@ VERSION101_SOPC_NCGR_FILES := files/application/wifi_earth/wifi_earth/narc_0005.
files/demo/title/titledemo/narc_0007.NCGR \
files/demo/title/titledemo/narc_0011.NCGR \
files/demo/title/titledemo/narc_0015.NCGR \
- files/graphic/poketch/narc_0010.NCGR
+ files/graphic/poketch/narc_0010.NCGR \
+ files/resource/eng/trial/trial/narc_0001.NCGR \
+ files/resource/eng/trial/trial/narc_0004.NCGR
8BPP_COMP10_NOPAD_NCLR_PNG_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \
files/poketool/trgra/trbgra/narc_0002.NCLR \
@@ -696,7 +702,9 @@ NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \
files/poketool/trgra/trfgra/narc_0190.NCGR \
files/poketool/trgra/trfgra/narc_0192.NCGR \
files/poketool/trgra/trfgra/narc_0194.NCGR \
-
+ files/resource/eng/trial/trial/narc_0001.NCGR \
+ files/resource/eng/trial/trial/narc_0004.NCGR \
+ files/resource/eng/trial/trial/narc_0007.NCGR \
NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \
files/data/cell0.NCLR \
@@ -935,6 +943,9 @@ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \
files/poketool/trgra/trfgra/narc_0190.NCLR \
files/poketool/trgra/trfgra/narc_0192.NCLR \
files/poketool/trgra/trfgra/narc_0194.NCLR \
+ files/resource/eng/trial/trial/narc_0000.NCLR \
+ files/resource/eng/trial/trial/narc_0003.NCLR \
+ files/resource/eng/trial/trial/narc_0006.NCLR \
NCER_CLEAN_LIST := files/poketool/icongra/poke_icon/narc_0002.NCER \
files/poketool/icongra/poke_icon/narc_0004.NCER \
@@ -943,4 +954,6 @@ NCER_CLEAN_LIST := files/poketool/icongra/poke_icon/narc_0002.NCER \
NSCR_CLEAN_LIST := files/demo/title/titledemo/narc_0000.NSCR \
files/demo/title/titledemo/narc_0008.NSCR \
files/demo/title/titledemo/narc_0012.NSCR \
- files/demo/title/titledemo/narc_0017.NSCR
+ files/demo/title/titledemo/narc_0017.NSCR \
+ files/resource/eng/trial/trial/narc_0002.NSCR \
+ files/resource/eng/trial/trial/narc_0005.NSCR