diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-15 09:46:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-15 09:46:57 -0400 |
| commit | 8352ebcc48c04388eeb5089bb7452c23486dc341 (patch) | |
| tree | d60941beedcd15c5a4d73a62fa8b9b99accf5831 /data | |
| parent | 8d4dcb228afaf8dfc8198b1955d42d1794ac3d81 (diff) | |
| parent | 780e49dbc8f833fac36ac47bb1be0e0972fce24b (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer
Diffstat (limited to 'data')
| -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 |