Move the 'menutxt' macro the s2.macros.asm

KiS2 removes the code that this macro is in, requiring that it be moved somewhere else.
sonicretro · May 6, 2022 · b9d1115 · b9d1115
1 parent 4c49707
commit b9d1115
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/s2.asm b/s2.asm
@@ -11280,10 +11280,6 @@ dword_8732:
 	charset ' ',0
 
 	; Menu text
-menutxt	macro	text
-	dc.b	strlen(text)-1
-	dc.b	text
-	endm
 Text2P_EmeraldHill:	menutxt	"EMERALD HILL"	; byte_874A:
 	rev02even
 Text2P_MysticCave:	menutxt	" MYSTIC CAVE"	; byte_8757:

diff --git a/s2.macros.asm b/s2.macros.asm
@@ -267,3 +267,9 @@ planeLocH40 function col,line,(($80 * line) + (2 * col))
 
 ; function to calculate the location of a tile in plane mappings with a width of 128 cells
 planeLocH80 function col,line,(($100 * line) + (2 * col))
+
+; macro formatting text for the game's menus
+menutxt	macro	text
+	dc.b	strlen(text)-1
+	dc.b	text
+	endm