Merged Emerald Expansion and Follower Pokemon

asm/macros/event.inc

@@ -1735,6 +1735,28 @@
 	.2byte \quantity
 	.endm
 
+	@ sets an NPC up to follow the player
+	.macro setfollower localId:req, flags:req
+	.byte 0xe3
+	.byte \localId
+	.2byte \flags
+	.endm
+	
+	@ remove the following NPC (assumes there will only ever be one)
+	.macro destroyfollower
+	.byte 0xe4
+	.endm
+	
+	@ makes the player and follower face one another
+	.macro facefollower
+	.byte 0xe5
+	.endm
+	
+	@ checks if you have a follower. returns the result to VAR_RESULT
+	.macro checkfollower
+	.byte 0xe6
+	.endm
+
 
 @ Supplementary
 
@@ -2018,3 +2040,30 @@
 	setvar VAR_0x8002, \tryMultiple
 	special TrySpecialOverworldEvo
 	.endm
+	.macro pokemonfaceplayer objectId=254
+	setvar VAR_UNUSED_0x8014, \objectId
+	callnative ScrCmd_pokemonfaceplayer
+	.endm
+
+	.macro updatefollowerpokemongraphic
+	setvar VAR_UNUSED_0x8014, 1
+	callnative UpdateFollowerPokemonGraphic
+	.endm
+
+	.macro hidefollower
+	callnative HideFollower
+	.endm
+
+	.macro showfollower
+	callnative ShowFollower
+	.endm
+    
+    .macro followerintopokeball
+    setvar VAR_UNUSED_0x8014, 0
+    callnative FollowerIntoPokeball
+    .endm
+    
+    .macro setfollowerwarppos pos:req
+    setvar VAR_RESULT, \pos
+    callnative SetFollowerWarpPosition
+    .endm