Remove extraneous macros and constants from berry fix

2018-12-16 20:24:01 -05:00
parent f91b71d395
commit 0aceac2d34
8 changed files with 6 additions and 1068 deletions
@@ -1,6 +1,6 @@
-	.include "asm/macros/asm.inc"
-	.include "asm/macros/function.inc"
-	.include "constants/gba_constants.inc"
+	.include "../../asm/macros/asm.inc"
+	.include "../../asm/macros/function.inc"
+	.include "../../constants/gba_constants.inc"

 	.syntax unified

@@ -1,12 +0,0 @@
-	.macro inc x
-	.set \x, \x + 1
-	.endm
-
-	.macro enum_start x=0
-	.set __enum__, \x
-	.endm
-
-	.macro enum constant
-	.equiv \constant, __enum__
-	inc __enum__
-	.endm
@@ -1,29 +0,0 @@
-	.macro arm_func_start name
-	.align 2, 0
-	.global \name
-	.arm
-	.type \name, %function
-	.endm
-
-	.macro arm_func_end name
-	.size \name, .-\name
-	.endm
-
-	.macro thumb_func_start name
-	.align 2, 0
-	.global \name
-	.thumb
-	.thumb_func
-	.type \name, %function
-	.endm
-
-	.macro non_word_aligned_thumb_func_start name
-	.global \name
-	.thumb
-	.thumb_func
-	.type \name, %function
-	.endm
-
-	.macro thumb_func_end name
-	.size \name, .-\name
-	.endm