Allow labels defined inside macros to be used as absolute 16b values

1 files changed, 1 insertions, 18 deletions

diff --git a/parameters.go b/parameters.go
index 5e234f5..4c787f3 100644
--- a/parameters.go
+++ b/parameters.go
@@ -120,7 +120,7 @@ func Raw16(labels *Labels, defs *Definitions, param string) (uint16, error) {
 		return uint16(res), nil
 	}
 
-	if strings.HasPrefix(param, "=") && !strings.HasPrefix(param, "=$") {
+	if strings.HasPrefix(param, "=") {
 		if labels == nil {
 			return 0, nil
 		}
@@ -144,23 +144,6 @@ func Raw16(labels *Labels, defs *Definitions, param string) (uint16, error) {
 	return uint16(res), err
 }
 
-func MacroLabel(labels *Labels, defs *Definitions, param string) (uint16, error) {
-	if strings.HasPrefix(param, "=$") {
-		if labels == nil {
-			return 0, nil
-		}
-
-		label := strings.ToUpper(strings.TrimPrefix(param, "="))
-		labelValue, ok := (*labels)[label]
-		if !ok {
-			return 0, fmt.Errorf("Label \"%s\" not found", label)
-		}
-
-		return uint16(labelValue), nil
-	}
-	return 0, fmt.Errorf("Invalid macro label")
-}
-
 func Reg16Indirect(_ *Labels, _ *Definitions, param string) (uint16, error) {
 	switch param {
 	case "(BC)":