diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-14 19:08:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-14 19:08:36 -0400 |
commit | 780e49dbc8f833fac36ac47bb1be0e0972fce24b (patch) | |
tree | 3117e28c4fc71323127dd7ba834007743036ecea | |
parent | cc9d54bf6d3666fc3a395f9fe6141cfa97dada03 (diff) | |
parent | fd3175bde46148eb22ec589686214dbad4b8b638 (diff) |
Merge pull request #1375 from GriffinRichards/bugfix-end
Note missing end in Trainer Hill
-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 |