X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fhelpers.c;h=ad52123b97a39a1eed528036a861948c5344c75a;hb=f5bc521c83d95d35e852747402a44d1411252c2b;hp=b66f5ee60dd8cad3f08c05cc9a30423b9c721e6f;hpb=8436ed0d04bf12d2478bffbe3ea45531fa954686;p=uccvend-snackrom.git

diff --git a/ROM2/helpers.c b/ROM2/helpers.c
index b66f5ee..ad52123 100644
--- a/ROM2/helpers.c
+++ b/ROM2/helpers.c
@@ -9,24 +9,25 @@ void delay(u16 ms) {
 	 * XXX - how do we know gcc isn't optimising this? it seems to optimise after
 	 * parsing C -> asm, but before asm -> machine code.
 	 */
-	asm volatile ("pshx\npsha\npshb\n"); /* save registers */
-	asm volatile ("ldx %0\n" :: "m" (ms));
+	//asm volatile ("pshx\npsha\npshb\n"); /* save registers */
+	asm volatile ("ldx %0\n" :: "m" (ms) : "x");
 	asm volatile (
-		"loop:\n"
-		"	dex\n"                  /* 3 */
-		"	beq out\n"              /* 3 */
-		"	ldd #327\n"             /* 3 */
-		"inner_loop:\n" /* 15 cycles each */
-		"	cpd #0x0000\n"          /* 5 */
-		"	beq inner_loop_end\n"   /* 3 */
-		"	subd #0x0001\n"         /* 4 */
-		"	bra inner_loop\n"       /* 3 */
-		"inner_loop_end:\n"
-		"	bra loop\n"             /* 3 */
-		"out:\n"
-		"	pulb\n"
+		"delay_loop:\n"
+		"	dex\n"                        /* 3 */
+		"	beq delay_out\n"              /* 3 */
+		//"	ldd #327\n"                   /* 3 */
+		"	ldd #150\n"                   /* 3 */
+		"delay_inner_loop:\n" /* 15 cycles each */
+		"	cpd #0x0000\n"                /* 5 */
+		"	beq delay_inner_loop_end\n"   /* 3 */
+		"	subd #0x0001\n"               /* 4 */
+		"	bra delay_inner_loop\n"       /* 3 */
+		"delay_inner_loop_end:\n"
+		"	bra delay_loop\n"             /* 3 */
+		"delay_out:\n" ::: "x", "d");
+		/*"	pulb\n"
 		"	pula\n"
-		"	pulx\n");
+		"	pulx\n");*/
 }
 
 void my_strncpy(char* dst, char* src, u8 max_size) {
@@ -35,6 +36,16 @@ void my_strncpy(char* dst, char* src, u8 max_size) {
 	if (src[i] == 0 && i < max_size) dst[i] = 0; /* null terminator */
 }
 
+bool my_strncmp(char* a, char* b, u8 len) {
+	u8 i;
+	for (i = 0; i < len; i++) {
+		if (*a != *b) return 0;
+		a++;
+		b++;
+	}
+	return 1;
+}
+
 void my_memcpy(char* dst, char* src, u8 size) {
 	u8 i = 0;
 	for (i = 0; i < size; i++) dst[i] = src[i];