summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-09 20:40:25 -0500
committerhuderlem <huderlem@gmail.com>2019-11-10 16:37:14 -0600
commita3ee92a4e7c59c6274b6d7a1c7239845f5bbb8ab (patch)
tree376e689bf8f22360fba48caad169036a0cbf8778 /data/scripts
parent5ac8b126e96bae1be77725f9638a0e01c56b0767 (diff)
Document some frontier util funcs
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/battle_pike.inc18
-rw-r--r--data/scripts/trainer_hill.inc2
2 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 9892ffb7b..2a6da1a58 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -100,11 +100,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
@@ -181,11 +181,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
@@ -245,11 +245,11 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
@@ -276,7 +276,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D
end
BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special CallFrontierUtilFunc
@@ -287,7 +287,7 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E
BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E
setorcopyvar VAR_0x8006, VAR_RESULT
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 0
special CallFrontierUtilFunc
compare VAR_RESULT, 2
@@ -302,7 +302,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
- setvar VAR_0x8004, 21
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
special CallFrontierUtilFunc
return
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index 7d898a93d..db6105249 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -6,7 +6,7 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
special CallTrainerHillFunction
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, B_OUTCOME_LOST