diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index ee01806..781b195 100644 Binary files a/!TheEsc/!MapEdit,ff8 and b/!TheEsc/!MapEdit,ff8 differ diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index e6387f9..a25b02b 100644 Binary files a/!TheEsc/!RunImage,ff8 and b/!TheEsc/!RunImage,ff8 differ diff --git a/!TheEsc/c/Graphics b/!TheEsc/c/Graphics index 413035b..7ab57e7 100644 --- a/!TheEsc/c/Graphics +++ b/!TheEsc/c/Graphics @@ -19,7 +19,7 @@ void load_sprites(char* filename, unsigned char **buffername) int length; // Attempt to get file info - inreg.r[0] = 13; + inreg.r[0] = 5; inreg.r[1] = (int) filename; _kernel_swi(OS_File,&inreg,&outreg); @@ -29,7 +29,7 @@ void load_sprites(char* filename, unsigned char **buffername) // If it's <1 it's fil not found if(outreg.r[0] < 1) { - printf("Sprite file %s not found",filename); + printf("Sprite file %s not found, object type is %i and size is %i\n",filename,outreg.r[0],outreg.r[4]); exit(0); } @@ -37,7 +37,7 @@ void load_sprites(char* filename, unsigned char **buffername) if(length > 200000) { screen_nobuffer(); - printf("Sprite file %s seems unreasonably large at %i bytes",filename, length); + printf("Sprite file %s seems unreasonably large at %i bytes, object type is %i\n",filename, length, outreg.r[0]); exit(0); } @@ -47,7 +47,7 @@ void load_sprites(char* filename, unsigned char **buffername) if(buffername==NULL) { screen_nobuffer(); - printf("Couldn't malloc %i bytes for sprite buffer",length); + printf("Couldn't malloc %i bytes for sprite buffer\n",length); exit(0); } @@ -89,7 +89,8 @@ void display_mode(int mode) if (_kernel_swi(OS_ChangeDynamicArea, &inreg, &outreg) != NULL) { screen_nobuffer(); - printf("Couldn't OS_ChangeDynamicArea"); + while(1) + printf("Couldn't OS_ChangeDynamicArea\n"); exit(0); } } diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit index b9bb628..12f9bae 100644 --- a/!TheEsc/c/MapEdit +++ b/!TheEsc/c/MapEdit @@ -64,7 +64,7 @@ void game2_loadmap(char* filename) int length; // Attempt to get file info - inreg.r[0] = 13; + inreg.r[0] = 5; inreg.r[1] = (int) filename; _kernel_swi(OS_File,&inreg,&outreg); @@ -73,10 +73,9 @@ void game2_loadmap(char* filename) if(length > sizeof(fullmap)) { - // TODO: Work out why real machine doesn't appear to read size and gives object type 19 - /*screen_nobuffer(); - printf("Map exceeds %d bytes (%d bytes) Object Type %d",sizeof(fullmap),length,outreg.r[0]); - exit(0);*/ + screen_nobuffer(); + printf("Map exceeds %d bytes (%d bytes) object type is %d",sizeof(fullmap),length,outreg.r[0]); + exit(0); } // Attempt to get file info diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index a8a78ff..3825faa 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -43,7 +43,7 @@ void game2_loadmap(char* filename) int length; // Attempt to get file info - inreg.r[0] = 13; + inreg.r[0] = 5; inreg.r[1] = (int) filename; _kernel_swi(OS_File,&inreg,&outreg); @@ -52,10 +52,9 @@ void game2_loadmap(char* filename) if(length > sizeof(fullmap)) { - // TODO: Work out why real machine doesn't appear to read size and gives object type 19 - /*screen_nobuffer(); - printf("Map exceeds %d bytes (%d bytes) Object Type %d",sizeof(fullmap),length,outreg.r[0]); - exit(0);*/ + screen_nobuffer(); + printf("Map exceeds %d bytes (%d bytes) object type is %d\n",sizeof(fullmap),length,outreg.r[0]); + exit(0); } // Attempt to get file info