diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
| commit | 27ee7d567e34b76c737c4920cfeccc36e6221543 (patch) | |
| tree | 8df67f69c86109bb42e060100e2390ed20b33c61 /data/specials.inc | |
| parent | 1b0cfb075723af7b457ec118eca2888df449bf9e (diff) | |
| parent | 0bbe03f17030c8009508714fc2b41703f1a1310a (diff) | |
fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT
Diffstat (limited to 'data/specials.inc')
| -rw-r--r-- | data/specials.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/specials.inc b/data/specials.inc index 5b2459805..75f180420 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -251,7 +251,7 @@ gSpecials:: @ 81DBA64 def_special CallBattleArenaFunction def_special CallBattleFactoryFunction def_special CallBattlePikeFunction - def_special sub_81A8E7C + def_special CallBattlePyramidFunction def_special StopMapMusic def_special sub_81B99B4 def_special sub_81B9B80 |