diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 0338eb1..b9ee366 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -151,12 +151,20 @@ {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"grass.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"koakuma.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"MapTerrain.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"mapthatchhouseroof.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"mapwatertemp.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"maptreebark.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"maptreeleavesdark.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"maphousewall.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.dat","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.3.574", diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index aacc877..5a2a6f2 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -48,5 +48,5 @@ function drawModels(){ models = []; //var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0); -var spr = sprite_add("./Test Map/grass.png",0,false,false,0,0); -nu Model("./shrine thing.dat",spr); \ No newline at end of file +var spr = sprite_add("./Map 1/mapthatchhouseroof.png",0,false,false,0,0); +nu Model("./Map 1/Map 1.dat",spr); \ No newline at end of file diff --git a/eastern flames/objects/ARTICULATOR/Draw_72.gml b/eastern flames/objects/ARTICULATOR/Draw_72.gml index f887e85..7da52fd 100644 --- a/eastern flames/objects/ARTICULATOR/Draw_72.gml +++ b/eastern flames/objects/ARTICULATOR/Draw_72.gml @@ -5,16 +5,17 @@ global.viewMat = camera_get_view_mat(cam); setCam(); draw_set_color(c_black); draw_rectangle(-9999, -9999, 9999, 9999, false); +drawModels(); var i, j, k; for (i=0; i