diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-16 04:22:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 04:22:34 -0400 |
| commit | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (patch) | |
| tree | 156f18275a5187ae20fc5f5c3a72d61635f126ec /data/scripts/trainer_hill.inc | |
| parent | 20fa13616f3ad2ec2f7d68668b9f386355a10fa7 (diff) | |
| parent | 60a592a2c32d07d47c892204659a8576017584d1 (diff) | |
Merge branch 'master' into document-gyms2
Diffstat (limited to 'data/scripts/trainer_hill.inc')
| -rw-r--r-- | data/scripts/trainer_hill.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 5b43118d1..7d898a93d 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -10,11 +10,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost end TrainerHill_1F_MapScript2_2C8372: @ 82C8372 @@ -56,7 +56,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF waitstate end -TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 +TrainerHill_1F_EventScript_Lost:: @ 82C83C9 setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST |