Stop using the preprocessor.

engine/buena_scripts.asm

@@ -3,36 +3,36 @@ UnknownScript_0xa0b14:
 	iftrue UnknownScript_0xa0b73
 	checkcode $a
 	if_greater_than $11, UnknownScript_0xa0b4b
-	2call UnknownScript_0xa0b32
-	2jump UnknownScript_0xa0c0e
+	scall UnknownScript_0xa0b32
+	jump UnknownScript_0xa0c0e
 
 UnknownScript_0xa0b26:
 	checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
 	iftrue UnknownScript_0xa0b73
-	2call UnknownScript_0xa0b4f
-	2jump UnknownScript_0xa0b77
+	scall UnknownScript_0xa0b4f
+	jump UnknownScript_0xa0b77
 
 UnknownScript_0xa0b32:
 	checktime $1
 	iftrue UnknownScript_0xa0b41
 	checktime $2
 	iftrue UnknownScript_0xa0b46
-	2writetext UnknownText_0xa0d42
+	writetext UnknownText_0xa0d42
 	keeptextopen
 	end
 
 UnknownScript_0xa0b41:
-	2writetext UnknownText_0xa0c28
+	writetext UnknownText_0xa0c28
 	keeptextopen
 	end
 
 UnknownScript_0xa0b46:
-	2writetext UnknownText_0xa0c72
+	writetext UnknownText_0xa0c72
 	keeptextopen
 	end
 
 UnknownScript_0xa0b4b:
-	2writetext UnknownText_0xa0caf
+	writetext UnknownText_0xa0caf
 	end
 
 UnknownScript_0xa0b4f:
@@ -42,34 +42,34 @@ UnknownScript_0xa0b4f:
 	iftrue UnknownScript_0xa0b64
 	checktime $2
 	iftrue UnknownScript_0xa0b69
-	2writetext UnknownText_0xa0e29
+	writetext UnknownText_0xa0e29
 	keeptextopen
 	end
 
 UnknownScript_0xa0b64:
-	2writetext UnknownText_0xa0d96
+	writetext UnknownText_0xa0d96
 	keeptextopen
 	end
 
 UnknownScript_0xa0b69:
-	2writetext UnknownText_0xa0dcf
+	writetext UnknownText_0xa0dcf
 	keeptextopen
 	end
 
 UnknownScript_0xa0b6e:
-	2writetext UnknownText_0xa0e01
+	writetext UnknownText_0xa0e01
 	keeptextopen
 	end
 
 UnknownScript_0xa0b73:
-	2writetext UnknownText_0xa0e5e
+	writetext UnknownText_0xa0e5e
 	end
 
 UnknownScript_0xa0b77:
 	checkevent $0044
 	iftrue UnknownScript_0xa0b82
 	random $b
-	2jump UnknownScript_0xa0b84
+	jump UnknownScript_0xa0b84
 
 UnknownScript_0xa0b82:
 	random $e
@@ -91,59 +91,59 @@ UnknownScript_0xa0b84:
 	if_equal $d, UnknownScript_0xa0c0a
 
 UnknownScript_0xa0bbc:
-	2writetext UnknownText_0xa0efb
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa0efb
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bc2:
-	2writetext UnknownText_0xa0fcf
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa0fcf
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bc8:
-	2writetext UnknownText_0xa109d
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa109d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bce:
-	2writetext UnknownText_0xa1143
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1143
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bd4:
-	2writetext UnknownText_0xa1244
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1244
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bda:
-	2writetext UnknownText_0xa1318
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1318
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0be0:
-	2writetext UnknownText_0xa13d8
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa13d8
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0be6:
-	2writetext UnknownText_0xa1488
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1488
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bec:
-	2writetext UnknownText_0xa15de
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa15de
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bf2:
-	2writetext UnknownText_0xa1717
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1717
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bf8:
-	2writetext UnknownText_0xa183d
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa183d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bfe:
-	2writetext UnknownText_0xa19b1
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa19b1
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0c04:
-	2writetext UnknownText_0xa1ac0
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1ac0
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0c0a:
-	2writetext UnknownText_0xa1bed
+	writetext UnknownText_0xa1bed
 
 UnknownScript_0xa0c0d:
 	end
@@ -155,14 +155,14 @@ UnknownScript_0xa0c0e:
 	if_equal $2, UnknownScript_0xa0c24
 
 UnknownScript_0xa0c1c:
-	2writetext UnknownText_0xa1c88
+	writetext UnknownText_0xa1c88
 	end
 
 UnknownScript_0xa0c20:
-	2writetext UnknownText_0xa1d5f
+	writetext UnknownText_0xa1d5f
 	end
 
 UnknownScript_0xa0c24:
-	2writetext UnknownText_0xa1e2f
+	writetext UnknownText_0xa1e2f
 	end
 ; a0c28

engine/events.asm

@@ -929,13 +929,13 @@ CheckMenuOW: ; 96b30
 
 
 StartMenuScript: ; 96b58
-	3callasm StartMenu
-	2jump StartMenuCallback
+	callasm StartMenu
+	jump StartMenuCallback
 ; 96b5f
 
 SelectMenuScript: ; 96b5f
-	3callasm SelectMenu
-	2jump SelectMenuCallback
+	callasm SelectMenu
+	jump SelectMenuCallback
 ; 96b66
 
 StartMenuCallback:
@@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66
 ; 96b72
 
 .Script ; 96b72
-	2ptjump $d0e8
+	ptjump $d0e8
 ; 96b75
 
 .Asm ; 96b75
-	2ptcallasm $d0e8
+	ptcallasm $d0e8
 	end
 ; 96b79
 
@@ -1081,7 +1081,7 @@ UnknownScript_0x96c2e: ; 96c2e
 ; 96c2f
 
 UnknownScript_0x96c2f: ; 96c2f
-	3callasm Function16f5e
+	callasm Function16f5e
 	end
 ; 96c34
 
@@ -1096,7 +1096,7 @@ FallIntoMapScript: ; 96c38
 	playsound SFX_KINESIS
 	applymovement $0, MovementData_0x96c48
 	playsound SFX_STRENGTH
-	2call UnknownScript_0x96c4a
+	scall UnknownScript_0x96c4a
 	end
 ; 96c48
 
@@ -1116,7 +1116,7 @@ UnknownScript_0x96c4d: ; 96c4d
 
 UnknownScript_0x96c4f: ; 96c4f
 	deactivatefacing $3
-	3callasm Function96706
+	callasm Function96706
 	end
 ; 96c56
 

engine/fruit_trees.asm

@@ -1,32 +1,32 @@
 FruitTreeScript:: ; 44000
-	3callasm GetCurTreeFruit
+	callasm GetCurTreeFruit
 	loadfont
 	copybytetovar CurFruit
 	itemtotext $0, $0
-	2writetext FruitBearingTreeText
+	writetext FruitBearingTreeText
 	keeptextopen
-	3callasm TryResetFruitTrees
-	3callasm CheckFruitTree
+	callasm TryResetFruitTrees
+	callasm CheckFruitTree
 	iffalse .fruit
-	2writetext NothingHereText
+	writetext NothingHereText
 	closetext
-	2jump .end
+	jump .end
 
 .fruit
-	2writetext HeyItsFruitText
+	writetext HeyItsFruitText
 	copybytetovar CurFruit
 	giveitem $ff, 1
 	iffalse .packisfull
 	keeptextopen
-	2writetext ObtainedFruitText
-	3callasm PickedFruitTree
+	writetext ObtainedFruitText
+	callasm PickedFruitTree
 	specialsound
 	itemnotify
-	2jump .end
+	jump .end
 
 .packisfull
 	keeptextopen
-	2writetext FruitPackIsFullText
+	writetext FruitPackIsFullText
 	closetext
 
 .end

engine/scripting.asm

@@ -572,8 +572,8 @@ Function96f76: ; 96f76
 ; 96f77
 
 GiveItemScript: ; 96f77
-	3callasm Function96f76
-	2writetext ReceivedItemText
+	callasm Function96f76
+	writetext ReceivedItemText
 	iffalse .Full
 	waitbutton
 	specialsound