diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/scripts/maps/BattlePyramidSquare16.inc | |
parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) |
recorded battle merge conflicts fix
Diffstat (limited to 'data/scripts/maps/BattlePyramidSquare16.inc')
-rw-r--r-- | data/scripts/maps/BattlePyramidSquare16.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/scripts/maps/BattlePyramidSquare16.inc new file mode 100644 index 000000000..9308930d1 --- /dev/null +++ b/data/scripts/maps/BattlePyramidSquare16.inc @@ -0,0 +1,3 @@ +BattlePyramidSquare16_MapScripts:: @ 823D1A5 + .byte 0 + |