diff --git a/maps/RPGmap.json b/maps/RPGmap.json index eec3d3f..acc40db 100644 --- a/maps/RPGmap.json +++ b/maps/RPGmap.json @@ -7,16 +7,16 @@ 35, 36, 171, 172, 35, 36, 171, 172, 35, 36, 105, 106, 107, 108, 109, 110, 35, 36, 171, 172, 69, 70, 205, 206, 69, 70, 205, 206, 69, 70, 139, 140, 207, 208, 143, 144, 69, 70, 205, 206, 103, 104, 239, 240, 103, 104, 239, 240, 103, 104, 173, 174, 241, 242, 177, 178, 103, 104, 239, 240, - 137, 138, 137, 138, 1, 2, 137, 138, 1, 2, 137, 138, 1, 2, 137, 138, 1, 2, 33, 34, - 171, 172, 171, 172, 35, 36, 171, 172, 35, 36, 171, 172, 35, 36, 171, 172, 35, 36, 67, 68, - 205, 206, 205, 206, 69, 70, 205, 206, 69, 70, 205, 206, 69, 70, 205, 206, 69, 70, 205, 206, - 239, 240, 239, 240, 103, 104, 239, 240, 103, 104, 239, 240, 103, 104, 239, 240, 103, 104, 239, 240, - 1, 2, 137, 138, 1, 2, 137, 138, 1, 2, 137, 138, 1, 2, 137, 138, 1, 2, 137, 138, - 35, 36, 171, 172, 35, 36, 171, 172, 35, 36, 171, 172, 35, 36, 171, 172, 331, 332, 171, 172, - 69, 70, 205, 206, 69, 70, 205, 206, 69, 70, 235, 236, 233, 234, 205, 364, 365, 366, 367, 206, - 103, 104, 239, 240, 103, 104, 239, 240, 103, 104, 269, 270, 267, 268, 397, 398, 399, 400, 401, 402, - 1, 2, 237, 238, 1, 2, 137, 138, 1, 2, 233, 234, 235, 236, 431, 432, 433, 434, 435, 436, - 35, 36, 271, 272, 35, 353, 354, 172, 35, 36, 267, 268, 269, 270, 465, 466, 467, 468, 469, 470, + 137, 138, 137, 138, 1, 2, 137, 138, 341, 342, 345, 346, 411, 412, 137, 138, 1, 2, 33, 34, + 171, 172, 171, 172, 35, 36, 171, 172, 375, 376, 379, 380, 445, 446, 171, 172, 35, 36, 67, 68, + 205, 206, 205, 206, 69, 70, 205, 206, 413, 414, 205, 206, 69, 70, 205, 206, 69, 70, 205, 206, + 239, 240, 239, 240, 103, 104, 239, 240, 447, 448, 239, 240, 103, 104, 239, 240, 103, 104, 239, 240, + 1, 2, 137, 138, 1, 2, 137, 138, 413, 414, 137, 138, 1, 2, 137, 138, 1, 2, 137, 138, + 35, 36, 171, 172, 35, 36, 171, 172, 447, 448, 171, 172, 35, 36, 171, 172, 331, 332, 171, 172, + 69, 70, 205, 206, 69, 70, 205, 206, 413, 414, 235, 236, 233, 234, 205, 364, 365, 366, 367, 206, + 103, 104, 239, 240, 103, 104, 239, 240, 447, 448, 269, 270, 267, 268, 397, 398, 399, 400, 401, 402, + 1, 2, 237, 238, 1, 2, 137, 138, 413, 414, 233, 234, 235, 236, 431, 432, 433, 434, 435, 436, + 35, 36, 271, 272, 35, 353, 354, 172, 447, 448, 267, 268, 269, 270, 465, 466, 467, 468, 469, 470, 69, 70, 351, 352, 69, 387, 388, 206, 347, 348, 349, 350, 343, 344, 499, 500, 439, 440, 503, 504, 103, 104, 385, 386, 103, 104, 239, 240, 381, 382, 383, 384, 377, 378, 403, 404, 473, 474, 405, 406, 1, 2, 409, 410, 345, 346, 345, 346, 417, 418, 417, 418, 417, 418, 345, 346, 417, 418, 345, 346, diff --git a/maps/RPGmap.tmx b/maps/RPGmap.tmx index 0781631..41db434 100644 --- a/maps/RPGmap.tmx +++ b/maps/RPGmap.tmx @@ -10,16 +10,16 @@ 35,36,171,172,35,36,171,172,35,36,105,106,107,108,109,110,35,36,171,172, 69,70,205,206,69,70,205,206,69,70,139,140,207,208,143,144,69,70,205,206, 103,104,239,240,103,104,239,240,103,104,173,174,241,242,177,178,103,104,239,240, -137,138,137,138,1,2,137,138,1,2,137,138,1,2,137,138,1,2,33,34, -171,172,171,172,35,36,171,172,35,36,171,172,35,36,171,172,35,36,67,68, -205,206,205,206,69,70,205,206,69,70,205,206,69,70,205,206,69,70,205,206, -239,240,239,240,103,104,239,240,103,104,239,240,103,104,239,240,103,104,239,240, -1,2,137,138,1,2,137,138,1,2,137,138,1,2,137,138,1,2,137,138, -35,36,171,172,35,36,171,172,35,36,171,172,35,36,171,172,331,332,171,172, -69,70,205,206,69,70,205,206,69,70,235,236,233,234,205,364,365,366,367,206, -103,104,239,240,103,104,239,240,103,104,269,270,267,268,397,398,399,400,401,402, -1,2,237,238,1,2,137,138,1,2,233,234,235,236,431,432,433,434,435,436, -35,36,271,272,35,353,354,172,35,36,267,268,269,270,465,466,467,468,469,470, +137,138,137,138,1,2,137,138,341,342,345,346,411,412,137,138,1,2,33,34, +171,172,171,172,35,36,171,172,375,376,379,380,445,446,171,172,35,36,67,68, +205,206,205,206,69,70,205,206,413,414,205,206,69,70,205,206,69,70,205,206, +239,240,239,240,103,104,239,240,447,448,239,240,103,104,239,240,103,104,239,240, +1,2,137,138,1,2,137,138,413,414,137,138,1,2,137,138,1,2,137,138, +35,36,171,172,35,36,171,172,447,448,171,172,35,36,171,172,331,332,171,172, +69,70,205,206,69,70,205,206,413,414,235,236,233,234,205,364,365,366,367,206, +103,104,239,240,103,104,239,240,447,448,269,270,267,268,397,398,399,400,401,402, +1,2,237,238,1,2,137,138,413,414,233,234,235,236,431,432,433,434,435,436, +35,36,271,272,35,353,354,172,447,448,267,268,269,270,465,466,467,468,469,470, 69,70,351,352,69,387,388,206,347,348,349,350,343,344,499,500,439,440,503,504, 103,104,385,386,103,104,239,240,381,382,383,384,377,378,403,404,473,474,405,406, 1,2,409,410,345,346,345,346,417,418,417,418,417,418,345,346,417,418,345,346, diff --git a/src/main.zig b/src/main.zig index 3c1898b..a361175 100644 --- a/src/main.zig +++ b/src/main.zig @@ -28,8 +28,10 @@ var sound_timer: u8 = 0; var textBuf: [160]u8 = undefined; var done: bool = false; +var camera: [400]u9 = []u9{} ** 400; + export fn start() void { - palette.mist(); + //palette.mist(); } fn bonk() void { diff --git a/src/maps/rpg.zig b/src/maps/rpg.zig index c03d8ca..294416e 100644 --- a/src/maps/rpg.zig +++ b/src/maps/rpg.zig @@ -23,25 +23,25 @@ pub const data = [400]u9{ 139, 206, 207, 142, 143, 68, 69, 204, 205, 102, 103, 238, 239, 102, 103, 238, 239, 102, 103, 172, 173, 240, 241, 176, 177, 102, 103, 238, 239, 136, - 137, 136, 137, 0, 1, 136, 137, 0, 1, 136, - 137, 0, 1, 136, 137, 0, 1, 32, 33, 170, - 171, 170, 171, 34, 35, 170, 171, 34, 35, 170, - 171, 34, 35, 170, 171, 34, 35, 66, 67, 204, - 205, 204, 205, 68, 69, 204, 205, 68, 69, 204, + 137, 136, 137, 0, 1, 136, 137, 340, 341, 344, + 345, 410, 411, 136, 137, 0, 1, 32, 33, 170, + 171, 170, 171, 34, 35, 170, 171, 374, 375, 378, + 379, 444, 445, 170, 171, 34, 35, 66, 67, 204, + 205, 204, 205, 68, 69, 204, 205, 412, 413, 204, 205, 68, 69, 204, 205, 68, 69, 204, 205, 238, - 239, 238, 239, 102, 103, 238, 239, 102, 103, 238, + 239, 238, 239, 102, 103, 238, 239, 446, 447, 238, 239, 102, 103, 238, 239, 102, 103, 238, 239, 0, - 1, 136, 137, 0, 1, 136, 137, 0, 1, 136, + 1, 136, 137, 0, 1, 136, 137, 412, 413, 136, 137, 0, 1, 136, 137, 0, 1, 136, 137, 34, - 35, 170, 171, 34, 35, 170, 171, 34, 35, 170, + 35, 170, 171, 34, 35, 170, 171, 446, 447, 170, 171, 34, 35, 170, 171, 330, 331, 170, 171, 68, - 69, 204, 205, 68, 69, 204, 205, 68, 69, 234, + 69, 204, 205, 68, 69, 204, 205, 412, 413, 234, 235, 232, 233, 204, 363, 364, 365, 366, 205, 102, - 103, 238, 239, 102, 103, 238, 239, 102, 103, 268, + 103, 238, 239, 102, 103, 238, 239, 446, 447, 268, 269, 266, 267, 396, 397, 398, 399, 400, 401, 0, - 1, 236, 237, 0, 1, 136, 137, 0, 1, 232, + 1, 236, 237, 0, 1, 136, 137, 412, 413, 232, 233, 234, 235, 430, 431, 432, 433, 434, 435, 34, - 35, 270, 271, 34, 352, 353, 171, 34, 35, 266, + 35, 270, 271, 34, 352, 353, 171, 446, 447, 266, 267, 268, 269, 464, 465, 466, 467, 468, 469, 68, 69, 350, 351, 68, 386, 387, 205, 346, 347, 348, 349, 342, 343, 498, 499, 438, 439, 502, 503, 102,