More deprecated stuff removed

Author: RPGHacker

src/asar/assembleblock.cpp

@@ -2138,7 +2138,7 @@ void assembleblock(const char * block)
 		if (is("padlong")) len=3;
 		if (is("paddword")) len=4;
 		unsigned int val=getnum(par);
-		if(foundlabel) asar_throw_warning(1, warning_id_feature_deprecated, "labels in padbyte", "just... don't.");
+		if (foundlabel && !foundlabel_static) asar_throw_error(0, error_type_block, error_id_no_labels_here);
 		for (int i=0;i<12;i+=len)
 		{
 			unsigned int tmpval=val;
@@ -2170,7 +2170,7 @@ void assembleblock(const char * block)
 		if (is("filllong")) len=3;
 		if (is("filldword")) len=4;
 		unsigned int val= getnum(par);
-		if(foundlabel) asar_throw_warning(1, warning_id_feature_deprecated, "labels in fillbyte", "just... don't");
+		if (foundlabel && !foundlabel_static) asar_throw_error(0, error_type_block, error_id_no_labels_here);
 		for (int i=0;i<12;i+=len)
 		{
 			unsigned int tmpval=val;

tests/labels_static_fail.asm

@@ -2,6 +2,8 @@
 ;`errEno_labels_here
 ;`errElabel_cross_assignment
 ;`errEno_labels_here
+;`errEno_labels_here
+;`errEno_labels_here
 ;`errEdefine_label_math
 ;`errElabel_in_conditional
 ;`errElabel_in_conditional
@@ -47,9 +49,11 @@ incbin "data/64kb.bin":(8000)-(ANonStaticLabel+2)
 
 ANewLabel = ANonStaticLabel
 
-fillbyte $EE
+Here:
+fillbyte Here
 fill ANonStaticLabel
 
-!adefine #= ANonStaticLabel
+padbyte Here
+pad ANonStaticLabel
 
-; TODO: Test incbin and more.
+!adefine #= ANonStaticLabel

tests/labels_static_pass.asm

@@ -1,9 +1,11 @@
+;`+
 ;`56 78
 ;`BA
 ;`BA
 ;`EE EE EE
 ;`03
 ;`42
+;`007FFE EE EE
 ;P>Test passed. (1)
 ;P>Test passed. (2)
 ;P>Test passed. (3)
@@ -57,9 +59,10 @@ OtherFunStuff = FunStuff
 db 'a'
 db OtherFunStuff
 
+FillByte = $EE
 FillCount = 3
 
-fillbyte $EE
+fillbyte FillByte
 fill FillCount
 
 !adefine #= FillCount
@@ -74,3 +77,9 @@ endmacro
 
 %in_macro($40, $41, $42)
 
+
+org $00FFFE
+
+padbyte FillByte
+pad $018000
+