diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-29 20:56:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 20:56:15 -0400 |
| commit | 50e9666e1637b15bd57fd7ee88180e50d2eb5e8c (patch) | |
| tree | b1543b6d79695862cb60d686548dd1a996b69e8c /data/scripts | |
| parent | dea07dc8656c8fb32f5b389b9f4f9a30fe26e555 (diff) | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
Merge branch 'master' into doc-introcred
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/trainer_hill.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 34d0462bb..e4e453228 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -16,7 +16,9 @@ TrainerHill_OnWarp: @ 82C8372 TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C setvar VAR_TEMP_3, 1 -@ forced stop +.ifdef BUGFIX + end @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd +.endif TrainerHill_OnFrame: @ 82C8381 map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter |