Merge pull request #10 from srana3/jDeHoyos10_28

jacobD44 · web-flow · commit 580bc540db3d · 2024-10-28T22:11:02.000-05:00
started implementing the display
diff --git a/CS 2340/Project Files/display.asm b/CS 2340/Project Files/display.asm
@@ -0,0 +1,116 @@
+.globl OptionDisplay
+.globl SelectionDisplay
+
+.text
+	OptionDisplay:
+		li $t0, 0						# counter for the number of lines we have printed
+		li $t1, 0						# counter for the number of cells we have printed
+		la $t4, randKeyArray
+		Print:
+			bgtz $t0, StartCell			# if it's not the first line, print the cells
+			
+			li $v0, 4
+			la $a0, colNames				# print out the label for the columns
+			syscall
+
+			add $t0, $t0, 1				# increment lines printed by 1
+		
+		StartCell:
+			li $v0, 1
+			add $a0, $t0, $zero
+			syscall
+		
+		PrintCells:
+			li $v0, 4
+			lw $t5, ($t4)
+			bltz $t5, PrintKnown
+			
+			la $a0, unknown		
+			syscall
+			j NextCell
+			
+			PrintKnown:
+				la $a0, known
+				syscall
+			
+			NextCell:
+			add $t1, $t1, 1			# increment cells count by 1
+			add $t4, $t4, 4
+			blt $t1, 4, PrintCells		# if we haven't printed 4 cells in a row yet, print another cell
+			
+			li $t1, 0
+			la $a0, endCap
+			syscall
+			
+			add $t0, $t0, 1
+			
+			beq $t0, 5, End
+			
+			j Print
+		
+	SelectionDisplay:
+		li $t0, 0						# counter for the number of lines we have printed
+		li $t1, 0						# counter for the number of cells we have printed
+		la $t4, randKeyArray
+		
+		Print2:
+			bgtz $t0, StartCell2			# if it's not the first line, print the cells
+			
+			li $v0, 4
+			la $a0, colNames				# print out the label for the columns
+			syscall
+
+			add $t0, $t0, 1				# increment lines printed by 1
+		
+		StartCell2:
+			li $v0, 1
+			add $a0, $t0, $zero
+			syscall
+		
+		PrintCell2:
+			li $v0, 4
+			
+			CheckFirst:
+				bne $t1, $a1, CheckSecond
+				li $t6, 0
+				la $t6, randContentArray
+				add $t6, $t6, $t7
+				la $a0, 0($t6)
+				syscall
+				j NextCell2
+				
+			 CheckSecond:
+			 	bne $t1, $a2, Unselected
+			 	la $t6, randContentArray
+				add $t6, $t6, $t2
+				la $a0, 0($t6)
+				syscall
+				j NextCell2
+			 	
+			 Unselected:
+			 	lw $t5, ($t4)
+				bltz $t5, PrintKnown2
+			
+				la $a0, unknown		
+				syscall
+				j NextCell2
+			
+				PrintKnown2:
+					la $a0, known
+					syscall
+		NextCell2:
+			add $t1, $t1, 1			# increment cells count by 1
+			rem $a3, $t1, 4
+			add $t4, $t4, 4
+			bnez $a3, PrintCell2		# if we haven't printed 4 cells in a row yet, print another cell
+			la $a0, endCap
+			syscall
+			
+			add $t0, $t0, 1
+			
+			beq $t0, 5, End
+			
+			j Print2
+			
+	End:
+		jr $ra
diff --git a/CS 2340/Project Files/main.asm b/CS 2340/Project Files/main.asm
@@ -20,11 +20,11 @@
 	.globl IntToString
 	IntToString: .space 128		# bytes for the string version of contentArray
 	.globl prompt1
-	prompt1: .asciiz "\nEnter 1st coordinate (A-D, 1-4): "
+	prompt1: .asciiz "Enter 1st coordinate (A-D, 1-4): "
 	.globl prompt2
-	prompt2: .asciiz "\nEnter 2nd coordinate (A-D, 1-4): "
+	prompt2: .asciiz "Enter 2nd coordinate (A-D, 1-4): "
 	.globl not_match
-	not_match: .asciiz "\nNot a match!"
+	not_match: .asciiz "\nNot a match!\n"
 	.globl match
 	match: .asciiz "\nIt's a match!"
 	.globl invalid
@@ -37,6 +37,14 @@
 	match_count_message: .asciiz "\nNumber of matches: "
 	.globl newline
 	newline: .asciiz "\n"
+	.globl colNames
+	colNames: .asciiz "\n    A     B    C    D   \n"
+	.globl unknown
+	unknown: .asciiz "|  ?  "
+	.globl known
+	known: .asciiz "|      "
+	.globl endCap
+	endCap: .asciiz "|\n"
 	
 .text
 	StartGame:
diff --git a/CS 2340/Project Files/userInput.asm b/CS 2340/Project Files/userInput.asm
@@ -3,6 +3,7 @@
 .text
 # User Input Section
 	UserInput:
+		jal OptionDisplay
 		# Prompt user for the 1st coordinate
 		li $v0, 4					# print string syscall
 		la $a0, prompt1				# load 1st prompt message
@@ -28,6 +29,7 @@
 		sub $t7, $t7, 1				# row starts from 0
 		mul $t7, $t7, 4				# row * 4 to get row index offset
 		add $t7, $t7, $t6			# final index = row index + column index
+		add $a1, $t7, $zero			# store the index number into a temp variable for use in the display code
 		mul $t7, $t7, 4				# convert index to byte offset (word = 4 bytes)
 		
 		# Load the value from the key array at 1st coordinate
@@ -61,36 +63,37 @@
 		
 		li $v0, 5					# read integer syscall (row)
 		syscall
-		move $t7, $v0				# store integer (row) into $t7
+		move $t2, $v0				# store integer (row) into $t7
 		
 		# Convert coordinates into an index
 		li $t9, 'A'
 		sub $t6, $t6, $t9			# convert char A-D to 0-3
 		
 		blt $t6, 0, invalid_input	# check for invalid input (column out of range)
 		bgt $t6, 3, invalid_input	# check for invalid input (column out of range)
-		blt $t7, 1, invalid_input	# check for invalid input (row out of range)
-		bgt $t7, 4, invalid_input	# check for invalid input (row out of range)
+		blt $t2, 1, invalid_input	# check for invalid input (row out of range)
+		bgt $t2, 4, invalid_input	# check for invalid input (row out of range)
 		
-		sub $t7, $t7, 1				# row starts from 0
-		mul $t7, $t7, 4				# row * 4 to get row index offset
-		add $t7, $t7, $t6			# final index = row index + column index
-		mul $t7, $t7, 4				# convert index to byte offset (word = 4 bytes)
+		sub $t2, $t2, 1				# row starts from 0
+		mul $t2, $t2, 4				# row * 4 to get row index offset
+		add $t2, $t2, $t6			# final index = row index + column index
+		add $a2, $t2, $zero			# store the index number into a temp variable for use in the display code
+		mul $t2, $t2, 4				# convert index to byte offset (word = 4 bytes)
 		
 		# Load the value from the key array at 2nd coordinate
 		la $t1, randKeyArray
-		add $t1, $t1, $t7			# calculate address
+		add $t1, $t1, $t2			# calculate address
 		lw $t9, 0($t1)				# load value
 		
-		# Load and print the value from the content array at 2nd coordinate
+		# Load and print the value from the content array at 1st coordinate
     		la $t1, randContentArray
-    		add $t1, $t1, $t7             # Calculate address
-    		li $v0, 4                     # print string syscall
+    		add $t1, $t1, $t2            # Calculate address
+   		li $v0, 4                     # print string syscall
     		la $a0, value_message         # load "The value at this coordinate is: "
     		syscall
     
     		li $v0, 4                     # print integer syscall
-    		la $a0, 0($t1)                  # move the value to $a0
+    		la $a0, 0($t1)                 # move the value to $a0
     		syscall
     
     		li $v0, 4                     # print string syscall for newline
@@ -106,33 +109,39 @@
 		b UserInput					# repeat the input process
 		
 	match_found:
+		li $a3, -1
+		la $t1, randKeyArray
+		add $t1, $t1, $t7
+		sw $a3, 0($t1)
+		la $t1, randKeyArray
+		add $t1, $t1, $t2
+		sw $a3, 0($t1)
 		li $v0, 4					# print string syscall
 		la $a0, match				# load "It's a match!" message
 		syscall
 		
 		# Play match sound
 		jal MatchSound
     
-		lw $t9, numMatches            # Load the current match count
-		addi $t9, $t9, 1            	# Increment match counter
-    		sw $t9, numMatches           	# Store updated match count
+		lw $t0, numMatches            # Load the current match count
+		addi $t0, $t0, 1            	# Increment match counter
+    		sw $t0, numMatches           	# Store updated match count
     		
     		# Print the number of matches found so far
 		li $v0, 4					# print string syscall
 		la $a0, match_count_message	# load "Number of matches: " message
 		syscall
 		
 		li $v0, 1					# print integer syscall
-		move $a0, $t9				# move the match count to $a0
+		move $a0, $t0				# move the match count to $a0
 		syscall
 		
 		li $v0, 4					# print string syscall for newline
 		la $a0, newline				# load newline
 		syscall
     		
     		# Check if 8 matches are found
-    		li $t8, 8
-    		bne $t9, $t8, UserInput      # If less than 8 matches, continue
+    		bne $t0, 8, UserInput      # If less than 8 matches, continue
 
     		# If 8 matches are made, go to EndGame
     		jal EndGame
