1 files changed, 141 insertions, 3 deletions
diff --git a/asm/macros/battle_frontier.inc b/asm/macros/battle_frontier.inc
index 2a6ee7d74..2382d3ed2 100644
--- a/asm/macros/battle_frontier.inc
+++ b/asm/macros/battle_frontier.inc
@@ -1,15 +1,95 @@
-@ To be populated with macros for the Battle Frontier CallFacilityFunction specials
+@ Frontier Util
 
+.macro frontier_checkoutcome
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_STATUS
+special CallFrontierUtilFunc
+.endm
 
-@ Frontier Util
+.macro frontier_getchallengestatus
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA
+setvar VAR_0x8005, 0
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_setchallengestatus status:req
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
+setvar VAR_0x8005, 0
+setvar VAR_0x8006, \status
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_getlvlmode
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA
+setvar VAR_0x8005, 1
+special CallFrontierUtilFunc
+.endm
 
 .macro frontier_setlvlmode lvlmode:req
-setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
 setvar VAR_0x8005, 1
 setvar VAR_0x8006, \lvlmode
 special CallFrontierUtilFunc
 .endm
 
+.macro frontier_getbattlenum
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA
+setvar VAR_0x8005, 2
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_setbattlenum battleNum:req
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
+setvar VAR_0x8005, 2
+copyvar VAR_0x8006, \battleNum
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_getbattleoutcome
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA
+setvar VAR_0x8005, 5
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_set data:req, val=0xFFFF
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
+setvar VAR_0x8005, \data
+.if \val == 0xFFFF
+@ no value provided
+.elseif \val >= VARS_START
+copyvar VAR_0x8006, \val
+.else
+setvar VAR_0x8006, \val
+.endif
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_loadselectedmons
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+setvar VAR_0x8005, FRONTIER_PARTY_SIZE
+special CallFrontierUtilFunc
+.endm
+
+@ Facilities with only 1 mode dont provide the mode argument
+.macro frontier_results facility:req, mode=0xFF
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
+setvar VAR_0x8005, \facility
+.if \mode != 0xFF
+setvar VAR_0x8006, \mode
+.endif
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_getbrainstatus
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_BRAIN_STATUS
+special CallFrontierUtilFunc
+.endm
+
+.macro frontier_resetsketch
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESET_SKETCH_MOVES
+special CallFrontierUtilFunc
+.endm
+
+
 @ Battle Tower
 
 .macro battletower_getstreak
@@ -18,16 +98,74 @@ setvar VAR_0x8005, 1
 special CallBattleTowerFunc
 .endm
 
+
 @ Battle Dome
 
+
 @ Battle Palace
 
+
 @ Battle Arena
 
+
 @ Battle Factory
 
+
 @ Battle Pike
 
+.macro battlepike_getstreak
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
+setvar VAR_0x8005, 1
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_setstreak streak:req
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
+setvar VAR_0x8005, 1
+.if \streak >= VARS_START
+copyvar VAR_0x8006, \streak
+.else
+setvar VAR_0x8006, \streak
+.endif
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_isfinalroom
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_FINAL_ROOM
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_setroomobjects
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_getroomtype
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_setnextroom
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_gethint
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_nohealing set:req
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
+setvar VAR_0x8005, \set
+special CallBattlePikeFunction
+.endm
+
+.macro battlepike_ispartyfullhealth
+setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH
+special CallBattlePikeFunction
+.endm
+
 @ Battle Pyramid
 
 @ Battle Tent