diff --git a/.gitignore b/.gitignore index 07050c6..e2d212b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ build/ /*.chd *.tiled-session /.pcsx +temp/ diff --git a/assets/sprites/CHARA/SONIC.CHARA b/assets/sprites/CHARA/SONIC.CHARA index 4c8f444..543cede 100644 Binary files a/assets/sprites/CHARA/SONIC.CHARA and b/assets/sprites/CHARA/SONIC.CHARA differ diff --git a/assets/sprites/CHARA/SONIC.TIM b/assets/sprites/CHARA/SONIC.TIM index 05276e7..607123a 100644 Binary files a/assets/sprites/CHARA/SONIC.TIM and b/assets/sprites/CHARA/SONIC.TIM differ diff --git a/assets/sprites/CHARA/SONIC.ase b/assets/sprites/CHARA/SONIC.ase new file mode 100644 index 0000000..96d4ea2 Binary files /dev/null and b/assets/sprites/CHARA/SONIC.ase differ diff --git a/assets/sprites/CHARA/SONIC.aseprite b/assets/sprites/CHARA/SONIC.aseprite deleted file mode 100644 index 905ef03..0000000 Binary files a/assets/sprites/CHARA/SONIC.aseprite and /dev/null differ diff --git a/assets/sprites/CHARA/SONIC.json b/assets/sprites/CHARA/SONIC.json index d543c62..d482c75 100644 --- a/assets/sprites/CHARA/SONIC.json +++ b/assets/sprites/CHARA/SONIC.json @@ -1 +1 @@ -{"filename":"/home/alchemist/git/engine-psx/assets/sprites/CHARA/SONIC.aseprite","height":56,"width":56,"tags":[{"name":"Stopped","aniDir":"forward","from":0,"to":0,"color":"#000000"},{"name":"Idle","aniDir":"forward","from":1,"to":4,"color":"#000000"},{"name":"Walking","aniDir":"forward","from":5,"to":10,"color":"#000000"},{"name":"Running","aniDir":"forward","from":11,"to":14,"color":"#000000"},{"name":"Rolling","aniDir":"forward","from":15,"to":22,"color":"#000000"},{"name":"Skidding","aniDir":"forward","from":23,"to":23,"color":"#000000"},{"name":"PeelOut","aniDir":"forward","from":24,"to":27,"color":"#000000"},{"name":"Pushing","aniDir":"forward","from":28,"to":31,"color":"#000000"},{"name":"CrouchDown","aniDir":"forward","from":32,"to":32,"color":"#000000"},{"name":"LookUp","aniDir":"forward","from":33,"to":33,"color":"#000000"},{"name":"Spring","aniDir":"forward","from":35,"to":35,"color":"#000000"},{"name":"Hurt","aniDir":"forward","from":36,"to":36,"color":"#000000"},{"name":"Death","aniDir":"forward","from":37,"to":37,"color":"#000000"}],"layers":[{"cels":[{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[1,2,3,4,0,5,6,7,8,0,9,10,11,12,0,0,13,14,15,0,0,16,17,18,0,0,19,20,21,22],"height":6},"frame":0},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[1,2,3,4,0,5,6,23,24,0,9,10,25,26,0,0,13,14,15,0,0,16,17,18,0,0,19,20,21,22],"height":6},"frame":1},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,27,28,0,0,29,30,31,32,0,33,34,35,36,0,37,38,39,40,0,41,42,43,44,0,0,45,46,47,48],"height":6},"frame":2},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,27,28,0,0,29,30,49,50,0,33,34,51,52,0,37,38,39,40,0,41,42,43,44,0,0,45,46,47,48],"height":6},"frame":3},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,27,28,0,0,29,30,49,50,0,33,34,51,52,0,37,38,39,40,0,41,42,53,54,55,0,45,46,56,57],"height":6},"frame":4},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,58,59,0,0,0,60,61,62,0,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,0,0,0],"height":6},"frame":5},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,80,81,82,0,0,83,84,85,0,86,87,88,89,90,0,91,92,93,0,0,94,95,96,97,0,98,57,99,100],"height":6},"frame":6},{"bounds":{"x":16,"height":48,"width":24,"y":8},"tilemap":{"width":3,"tiles":[0,101,0,102,103,104,105,106,107,108,109,110,111,112,113,114,115,0],"height":6},"frame":7},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,0,101,0,0,0,102,103,104,0,0,105,106,116,117,118,119,120,121,122,123,124,125,126,127,128,129,0,130,0],"height":6},"frame":8},{"bounds":{"x":8,"height":48,"width":32,"y":8},"tilemap":{"width":4,"tiles":[0,131,132,0,0,133,134,135,0,136,137,138,139,140,141,142,143,144,145,146,0,0,147,148],"height":6},"frame":9},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,149,150,0,0,0,151,152,153,0,154,155,156,157,158,0,159,160,161,0,162,163,164,165,0,166,167,168,169,0],"height":6},"frame":10},{"bounds":{"x":8,"height":40,"width":32,"y":16},"tilemap":{"width":4,"tiles":[0,170,171,172,0,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187],"height":5},"frame":11},{"bounds":{"x":8,"height":40,"width":32,"y":16},"tilemap":{"width":4,"tiles":[0,188,189,190,0,191,192,175,193,194,195,196,197,198,199,200,0,201,202,203],"height":5},"frame":12},{"bounds":{"x":8,"height":40,"width":32,"y":16},"tilemap":{"width":4,"tiles":[0,170,171,172,0,173,174,175,204,205,206,207,208,209,210,211,212,213,214,215],"height":5},"frame":13},{"bounds":{"x":8,"height":40,"width":32,"y":16},"tilemap":{"width":4,"tiles":[0,188,189,190,0,216,174,175,217,218,219,220,221,222,223,224,0,225,226,227],"height":5},"frame":14},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,228,229,230,0,231,232,233,234,235,236,237,238,239,240,0,241,242,243,0],"height":4},"frame":15},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,244,245,246,0,247,248,249,250,251,252,253,254,254,255,0,256,257,258,259],"height":4},"frame":16},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,260,261,262,0,263,264,265,266,267,268,269,270,271,272,273,274,275,276,0],"height":4},"frame":17},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,244,245,246,0,247,248,249,250,251,252,253,254,254,255,0,256,257,258,259],"height":4},"frame":18},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[277,278,279,280,0,281,282,283,284,285,286,287,288,289,290,0,291,292,293,0],"height":4},"frame":19},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,244,245,246,0,247,248,249,250,251,252,253,254,254,255,0,256,257,258,259],"height":4},"frame":20},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,294,295,296,0,297,298,299,300,301,302,303,304,305,306,307,308,309,310,0],"height":4},"frame":21},{"bounds":{"x":8,"height":32,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,244,245,246,0,247,248,249,250,251,252,253,254,254,255,0,256,257,258,259],"height":4},"frame":22},{"bounds":{"x":8,"height":40,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,311,312,313,0,314,315,316,317,318,319,320,321,322,323,0,324,325,326,327,0,0,0,328,329],"height":5},"frame":23},{"bounds":{"x":0,"height":40,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,0,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,0,0,348,349,350],"height":5},"frame":24},{"bounds":{"x":0,"height":40,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,0,351,352,353,354,334,355,356,337,357,358,359,360,361,362,363,364,365,366,0,0,367,368,369],"height":5},"frame":25},{"bounds":{"x":0,"height":40,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,0,330,331,332,354,334,370,336,337,371,372,373,374,342,375,376,377,378,379,0,380,381,382,383],"height":5},"frame":26},{"bounds":{"x":0,"height":40,"width":40,"y":16},"tilemap":{"width":5,"tiles":[0,0,351,352,353,354,334,355,356,337,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398],"height":5},"frame":27},{"bounds":{"x":8,"height":40,"width":32,"y":16},"tilemap":{"width":4,"tiles":[0,399,400,401,0,402,403,404,0,405,406,407,408,409,410,411,412,413,414,415],"height":5},"frame":28},{"bounds":{"x":8,"height":48,"width":32,"y":8},"tilemap":{"width":4,"tiles":[0,29,416,0,0,417,418,419,0,420,421,422,0,423,424,425,426,427,428,429,430,431,432,0],"height":6},"frame":29},{"bounds":{"x":8,"height":40,"width":32,"y":16},"tilemap":{"width":4,"tiles":[0,399,400,401,0,402,403,404,0,433,434,407,435,436,437,438,439,440,441,442],"height":5},"frame":30},{"bounds":{"x":8,"height":48,"width":32,"y":8},"tilemap":{"width":4,"tiles":[0,29,416,0,0,417,418,419,0,420,421,422,0,443,444,445,446,447,448,438,0,449,450,0],"height":6},"frame":31},{"bounds":{"x":16,"height":32,"width":32,"y":24},"tilemap":{"width":4,"tiles":[0,451,452,453,454,455,456,457,458,459,460,461,462,463,464,22],"height":4},"frame":32},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[0,0,465,0,0,466,467,468,469,0,470,471,472,473,0,474,475,476,15,0,0,16,17,18,0,0,19,20,21,22],"height":6},"frame":33},{"bounds":{"x":8,"height":56,"width":32,"y":0},"tilemap":{"width":4,"tiles":[0,0,477,0,478,479,480,481,482,483,484,485,486,487,488,489,0,490,491,492,0,493,494,0,0,495,496,0],"height":7},"frame":34},{"bounds":{"x":8,"height":56,"width":32,"y":0},"tilemap":{"width":4,"tiles":[0,0,477,0,478,479,480,481,482,483,484,485,486,487,488,489,0,490,491,492,0,493,494,0,0,495,496,0],"height":7},"frame":35},{"bounds":{"x":0,"height":32,"width":48,"y":16},"tilemap":{"width":6,"tiles":[0,497,498,499,500,0,501,502,503,504,505,506,0,507,508,509,510,511,0,0,512,513,514,515],"height":4},"frame":36},{"bounds":{"x":8,"height":48,"width":40,"y":8},"tilemap":{"width":5,"tiles":[516,517,518,519,520,521,522,523,524,525,0,526,527,528,0,0,529,530,531,0,0,532,533,534,535,0,536,0,0,0],"height":6},"frame":37}],"name":"Flattened"}],"frames":[{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1}]} \ No newline at end of file +{"tags":[{"color":"#000000","name":"Stopped","aniDir":"forward","from":0,"to":0},{"color":"#000000","name":"Idle","aniDir":"forward","from":1,"to":4},{"color":"#000000","name":"Walking","aniDir":"forward","from":5,"to":10},{"color":"#000000","name":"Running","aniDir":"forward","from":11,"to":14},{"color":"#000000","name":"Rolling","aniDir":"forward","from":15,"to":21},{"color":"#000000","name":"Skidding","aniDir":"forward","from":22,"to":25},{"color":"#000000","name":"PeelOut","aniDir":"forward","from":26,"to":29},{"color":"#000000","name":"Pushing","aniDir":"forward","from":30,"to":33},{"color":"#000000","name":"CrouchDown","aniDir":"forward","from":34,"to":34},{"color":"#000000","name":"LookUp","aniDir":"forward","from":35,"to":35},{"color":"#000000","name":"Spring","aniDir":"forward","from":36,"to":40},{"color":"#000000","name":"Hurt","aniDir":"forward","from":41,"to":41},{"color":"#000000","name":"Death","aniDir":"forward","from":42,"to":42},{"color":"#000000","name":"Drown","aniDir":"forward","from":43,"to":43},{"color":"#000000","name":"Gasp","aniDir":"forward","from":44,"to":44}],"height":56,"layers":[{"cels":[{"tilemap":{"tiles":[1,2,3,4,0,5,6,7,8,0,9,10,11,12,0,0,13,14,15,0,0,16,17,18,0,0,19,20,21,22],"height":6,"width":5},"frame":0,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[1,2,3,4,0,5,6,23,24,0,9,10,25,26,0,0,13,14,15,0,0,16,17,18,0,0,19,20,21,22],"height":6,"width":5},"frame":1,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[0,27,28,0,0,0,29,30,31,0,32,33,34,35,0,36,37,38,39,0,0,40,41,42,0,0,43,44,45,46],"height":6,"width":5},"frame":2,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[0,27,28,0,0,0,29,47,48,0,32,33,49,50,0,36,37,38,39,0,0,40,41,42,0,0,43,44,45,46],"height":6,"width":5},"frame":3,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[0,27,28,0,0,0,29,47,48,0,32,33,49,50,0,36,37,38,39,0,0,40,51,52,53,0,43,44,54,55],"height":6,"width":5},"frame":4,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[56,57,58,0,59,60,61,62,63,64,65,66,67,68,69,0,70,71,72,0,73,74,0,0],"height":6,"width":4},"frame":5,"bounds":{"height":48,"x":16,"y":8,"width":32}},{"tilemap":{"tiles":[0,56,57,58,0,0,59,60,61,62,0,63,64,75,76,77,78,79,80,81,82,83,84,85,86,87,88,0,89,0],"height":6,"width":5},"frame":6,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[0,56,57,58,0,0,59,60,61,62,0,63,64,65,66,0,90,91,92,0,93,94,95,96,0,0,0,97,98,0],"height":6,"width":5},"frame":7,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[99,100,101,0,102,103,104,105,106,107,108,109,110,111,112,0,113,114,115,116,117,118,0,0],"height":6,"width":4},"frame":8,"bounds":{"height":48,"x":16,"y":8,"width":32}},{"tilemap":{"tiles":[0,99,100,101,0,0,0,102,103,104,105,0,0,119,120,121,122,0,123,124,125,126,127,128,129,130,131,132,133,0,134,55,0,0,0,0],"height":6,"width":6},"frame":9,"bounds":{"height":48,"x":8,"y":8,"width":48}},{"tilemap":{"tiles":[99,100,101,0,102,103,104,105,135,136,137,109,138,139,140,0,141,142,143,144,0,55,145,146],"height":6,"width":4},"frame":10,"bounds":{"height":48,"x":16,"y":8,"width":32}},{"tilemap":{"tiles":[0,147,148,149,150,0,151,152,153,154,155,156,157,158,159,160,161,162,163,164,0,165,166,167,0],"height":5,"width":5},"frame":11,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,168,169,170,171,0,172,173,174,154,175,176,177,178,179,180,181,182,183,184,0,185,186,187,0],"height":5,"width":5},"frame":12,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,147,148,149,150,0,151,152,153,154,0,188,189,190,191,192,193,194,195,196,0,197,198,199,0],"height":5,"width":5},"frame":13,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,168,169,170,171,0,172,200,153,154,201,202,203,204,205,206,207,208,209,210,0,211,212,213,0],"height":5,"width":5},"frame":14,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,214,215,216,0,217,218,219,220,221,222,223,224,225,226,0,227,228,229,230],"height":4,"width":5},"frame":15,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,231,232,233,234,235,236,237,238,239,240,241,242,237,243,0,244,245,246,247],"height":4,"width":5},"frame":16,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,248,249,250,251,252,253,254,255,256,257,258,259,260,261,0,262,263,264,0],"height":4,"width":5},"frame":17,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,231,232,233,234,235,236,237,238,239,240,241,242,237,243,0,244,245,246,247],"height":4,"width":5},"frame":18,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,265,266,267,0,268,269,270,271,272,0,273,274,275,276,0,277,278,279,280],"height":4,"width":5},"frame":19,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,231,232,233,234,235,236,237,238,239,240,241,242,237,243,0,244,245,246,247],"height":4,"width":5},"frame":20,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,281,282,283,284,285,286,287,288,289,290,291,292,293,294,0,295,296,297,298],"height":4,"width":5},"frame":21,"bounds":{"height":32,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,299,300,301,0,302,303,304,305,0,0,306,307,308,309,310,311,312,313,314,0,0,0,315,316],"height":5,"width":5},"frame":22,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,317,300,301,0,318,319,304,305,0,320,321,322,323,324,325,326,327,328,329,0,0,0,330,316],"height":5,"width":5},"frame":23,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[331,332,300,301,0,318,333,304,305,334,335,336,322,337,338,339,340,341,342,343,0,0,0,330,316],"height":5,"width":5},"frame":24,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,344,345,346,0,0,347,348,349,350,351,352,353,354,355,0,340,356,357,358,0,0,0,359,360],"height":5,"width":5},"frame":25,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,0,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,0,0,379,380,381],"height":5,"width":5},"frame":26,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,0,382,383,384,364,365,385,386,368,387,388,389,390,391,392,393,394,395,396,0,397,398,399,400],"height":5,"width":5},"frame":27,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,0,361,362,363,364,365,366,367,368,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415],"height":5,"width":5},"frame":28,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,0,382,383,384,364,365,416,386,368,417,418,419,420,391,421,422,423,424,425,0,0,426,427,428],"height":5,"width":5},"frame":29,"bounds":{"height":40,"x":8,"y":16,"width":40}},{"tilemap":{"tiles":[0,0,429,0,0,430,431,432,0,433,434,435,0,436,437,438,439,440,441,442,443,444,445,446],"height":6,"width":4},"frame":30,"bounds":{"height":48,"x":8,"y":8,"width":32}},{"tilemap":{"tiles":[0,0,429,0,0,430,431,432,0,433,434,435,0,447,448,449,450,451,452,453,454,455,456,0],"height":6,"width":4},"frame":31,"bounds":{"height":48,"x":8,"y":8,"width":32}},{"tilemap":{"tiles":[0,0,429,0,0,430,431,432,0,433,434,435,0,457,458,438,459,460,461,462,463,464,465,466],"height":6,"width":4},"frame":32,"bounds":{"height":48,"x":8,"y":8,"width":32}},{"tilemap":{"tiles":[0,0,429,0,0,430,431,432,0,433,434,435,0,467,468,449,469,470,471,453,0,472,473,0],"height":6,"width":4},"frame":33,"bounds":{"height":48,"x":8,"y":8,"width":32}},{"tilemap":{"tiles":[0,474,475,476,477,478,479,480,481,482,483,484,485,486,487,22],"height":4,"width":4},"frame":34,"bounds":{"height":32,"x":16,"y":24,"width":32}},{"tilemap":{"tiles":[0,0,488,0,0,489,490,491,492,0,493,494,495,496,0,0,497,498,15,0,0,16,17,18,0,0,19,20,21,22],"height":6,"width":5},"frame":35,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[0,499,500,501,0,0,502,503,504,0,0,505,506,507,0,508,509,510,511,512,0,513,514,515,0,0,516,517,518,0],"height":6,"width":5},"frame":36,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,0,534,535],"height":6,"width":3},"frame":37,"bounds":{"height":48,"x":16,"y":8,"width":24}},{"tilemap":{"tiles":[536,537,538,0,539,540,541,0,542,543,544,0,545,546,547,548,549,550,551,0,552,553,554,0],"height":6,"width":4},"frame":38,"bounds":{"height":48,"x":16,"y":8,"width":32}},{"tilemap":{"tiles":[555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,0,570,571,572,0,573,574,575,0],"height":6,"width":4},"frame":39,"bounds":{"height":48,"x":16,"y":8,"width":32}},{"tilemap":{"tiles":[499,576,577,0,578,579,580,0,581,582,583,584,585,586,587,0,0,588,589,0,0,590,0,0],"height":6,"width":4},"frame":40,"bounds":{"height":48,"x":16,"y":8,"width":32}},{"tilemap":{"tiles":[591,592,593,594,0,0,595,596,597,598,599,0,600,601,602,603,604,605,0,606,607,608,609,0],"height":4,"width":6},"frame":41,"bounds":{"height":32,"x":8,"y":16,"width":48}},{"tilemap":{"tiles":[610,611,612,613,614,615,616,617,618,619,0,620,621,622,0,0,623,624,625,0,0,626,627,628,629,0,630,0,631,632],"height":6,"width":5},"frame":42,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[610,633,634,635,614,615,636,637,638,619,0,639,640,641,0,0,642,624,625,0,0,626,627,628,629,0,630,0,631,632],"height":6,"width":5},"frame":43,"bounds":{"height":48,"x":8,"y":8,"width":40}},{"tilemap":{"tiles":[0,643,644,645,0,0,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,0,0,0],"height":6,"width":5},"frame":44,"bounds":{"height":48,"x":8,"y":8,"width":40}}],"name":"Sprite"}],"width":56,"frames":[{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1},{"duration":0.1}],"filename":"/home/alchemist/git/engine-psx/assets/sprites/CHARA/SONIC.ase"} \ No newline at end of file diff --git a/assets/sprites/CHARA/SONIC.png b/assets/sprites/CHARA/SONIC.png index 81215ba..7c3a29d 100644 Binary files a/assets/sprites/CHARA/SONIC.png and b/assets/sprites/CHARA/SONIC.png differ diff --git a/assets/sprites/CHARA/sonic-sheet.png b/assets/sprites/CHARA/sonic-sheet.png deleted file mode 100644 index d44aeb3..0000000 Binary files a/assets/sprites/CHARA/sonic-sheet.png and /dev/null differ diff --git a/tools/guide.org b/tools/guide.org index 3e3eeca..f44fdb9 100644 --- a/tools/guide.org +++ b/tools/guide.org @@ -86,6 +86,8 @@ names = [ "SPRING", "HURT", "DEATH", + "DROWN", + "GASP", ] def get_hash(name): @@ -115,6 +117,8 @@ print_hashes(names) #define ANIM_SPRING 0x068e01d4 #define ANIM_HURT 0x031b0144 #define ANIM_DEATH 0x04200167 +#define ANIM_DROWN 0x048a018b +#define ANIM_GASP 0x02d9012c #+end_example * Generating 8x8 tiles and their 16x16 mappings