From 387e36f4c3539999171532db21ebdb130c81d506 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Thu, 8 Apr 2021 20:34:49 +0100 Subject: [PATCH] Allow saving from map editor. More tiles (all a bit WIP) and some more map. --- !TheEsc/!MapEdit,ff8 | Bin 7092 -> 7176 bytes !TheEsc/Tiles,ff9 | Bin 13452 -> 22860 bytes !TheEsc/c/MapEdit | 18 ++++++++++++++++++ !TheEsc/mission2,ffd | Bin 10000 -> 10000 bytes 4 files changed, 18 insertions(+) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index de876ce592ad07b583958ca4771c936bad26185d..ee018069e6b2365ead5ed6442251eb2ce6d14e6b 100644 GIT binary patch delta 1044 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 diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit index 31e67c3..b9bb628 100644 --- a/!TheEsc/c/MapEdit +++ b/!TheEsc/c/MapEdit @@ -89,6 +89,19 @@ void game2_loadmap(char* filename) } +void game2_savemap(char* filename) +{ + // Attempt to get file info + inreg.r[0] = 10; + inreg.r[1] = (int) filename; + inreg.r[2] = 0xffd; + inreg.r[4] = (int) fullmap; + inreg.r[5] = (int) fullmap + sizeof(fullmap); + + _kernel_swi(OS_File,&inreg,&outreg); + +} + void game2_fillmap(int xoffset, int yoffset) { memcpy(map[0][0],fullmap+yoffset+(xoffset*100),10); @@ -235,6 +248,11 @@ void game2_tick_input() readmodkey = tick + 10; } } + // C + if(input_readkey(81)) + { + game2_savemap("mission2"); + } } int game2_tick() diff --git a/!TheEsc/mission2,ffd b/!TheEsc/mission2,ffd index ba8ad67bcbbb28413422a4bb82b7cf3bfc117990..0d59fe53a16fcdf046f293130cb04b2b183898e2 100644 GIT binary patch literal 10000 zcmeIyNe+Y{5QSl?9Rd!}N9p^YP6ih)h;FJ}bpBch(S#R2D4esePpz>H=Tkd%>y&oJ z-b&=0ltDXVs5Qkjw^@1qltbzkI3H6`Uih+{&-;;raYhs&10Ni|x6}{~_`< z&q#CbLCgLqmxpnGxN>bTjQ`1fTW5$?k zPT$g<+y3@L^1L-|Z3c&_>#{Yv{T0&X9X+gMT%TI${CNc^9J2}-m6lZnC>-~&3UOKj m1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNCfT;Ko#`vNKe