aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2022-10-27 19:15:01 +0200
committerBad Diode <bd@badd10de.dev>2022-10-27 19:15:01 +0200
commit75852933e7739ca726618533a5aa69f2a1d1322e (patch)
tree6a19141f4141898969c9ba9bf18cae068cf0954f
parent9fa782c9a97592498f417b7942be1c18cb3962b5 (diff)
downloaduxngba-75852933e7739ca726618533a5aa69f2a1d1322e.tar.gz
uxngba-75852933e7739ca726618533a5aa69f2a1d1322e.zip
Fix extra element being added to rom.c
-rw-r--r--tools/bin2carr/src/main.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/bin2carr/src/main.c b/tools/bin2carr/src/main.c
index 699db61..10ddcd8 100644
--- a/tools/bin2carr/src/main.c
+++ b/tools/bin2carr/src/main.c
@@ -64,6 +64,9 @@ write_array(FILE *file_in, FILE *file_out, char *arr_name, ElemSize elem_size) {
64 case ELEM_S8: { 64 case ELEM_S8: {
65 u8 elem; 65 u8 elem;
66 n_read = fread(&elem, sizeof(u8), 1, file_in); 66 n_read = fread(&elem, sizeof(u8), 1, file_in);
67 if (n_read == 0) {
68 break;
69 }
67 fprintf(file_out, "0x%02x,", elem); 70 fprintf(file_out, "0x%02x,", elem);
68 break; 71 break;
69 } 72 }
@@ -71,6 +74,9 @@ write_array(FILE *file_in, FILE *file_out, char *arr_name, ElemSize elem_size) {
71 case ELEM_S16: { 74 case ELEM_S16: {
72 u16 elem; 75 u16 elem;
73 n_read = fread(&elem, sizeof(u16), 1, file_in); 76 n_read = fread(&elem, sizeof(u16), 1, file_in);
77 if (n_read == 0) {
78 break;
79 }
74 fprintf(file_out, "0x%04x,", elem); 80 fprintf(file_out, "0x%04x,", elem);
75 break; 81 break;
76 } 82 }
@@ -78,6 +84,9 @@ write_array(FILE *file_in, FILE *file_out, char *arr_name, ElemSize elem_size) {
78 case ELEM_S32: { 84 case ELEM_S32: {
79 u32 elem; 85 u32 elem;
80 n_read = fread(&elem, sizeof(u32), 1, file_in); 86 n_read = fread(&elem, sizeof(u32), 1, file_in);
87 if (n_read == 0) {
88 break;
89 }
81 fprintf(file_out, "0x%08x,", elem); 90 fprintf(file_out, "0x%08x,", elem);
82 break; 91 break;
83 } 92 }
@@ -85,10 +94,16 @@ write_array(FILE *file_in, FILE *file_out, char *arr_name, ElemSize elem_size) {
85 case ELEM_S64: { 94 case ELEM_S64: {
86 u64 elem; 95 u64 elem;
87 n_read = fread(&elem, sizeof(u64), 1, file_in); 96 n_read = fread(&elem, sizeof(u64), 1, file_in);
97 if (n_read == 0) {
98 break;
99 }
88 fprintf(file_out, "0x%016lx,", elem); 100 fprintf(file_out, "0x%016lx,", elem);
89 break; 101 break;
90 } 102 }
91 } 103 }
104 if (n_read == 0) {
105 break;
106 }
92 107
93 if (counter == n_elem - 1) { 108 if (counter == n_elem - 1) {
94 fprintf(file_out, "\n"); 109 fprintf(file_out, "\n");