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

asm/macros/map.inc

@@ -21,17 +21,11 @@
 
 	@ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
 	.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
-	.byte \index
-	.byte \gfx
-	.byte OBJ_KIND_NORMAL
-	.space 1  @ Padding
+	.byte \index, OBJ_KIND_NORMAL
+	.2byte \gfx
 	.2byte \x, \y
-	.byte \elevation
-	.byte \movement_type
-	.byte ((\y_radius << 4) | \x_radius)
-	.space 1  @ Padding
-	.2byte \trainer_type
-	.2byte \sight_radius_tree_etc
+	.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0
+	.2byte \trainer_type, \sight_radius_tree_etc
 	.4byte \script
 	.2byte \event_flag
 	.space 2  @ Padding

asm/macros/movement.inc

@@ -162,5 +162,11 @@
 	create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8
 	create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP
 	create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN
+	create_movement_action follower_face_down, MOVEMENT_ACTION_FOLLOWING_POKEMON_FACESOUTH
+	create_movement_action follower_face_up, MOVEMENT_ACTION_FOLLOWING_POKEMON_FACENORTH
+	create_movement_action follower_face_left, MOVEMENT_ACTION_FOLLOWING_POKEMON_FACEWEST
+	create_movement_action follower_face_right, MOVEMENT_ACTION_FOLLOWING_POKEMON_FACEEAST
+	create_movement_action follower_shrink, MOVEMENT_ACTION_FOLLOWING_POKEMON_SHRINK
+	create_movement_action follower_grow, MOVEMENT_ACTION_FOLLOWING_POKEMON_GROW
 
 	create_movement_action step_end, MOVEMENT_ACTION_STEP_END