aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SilphCo11F.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/SilphCo11F.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/SilphCo11F.asm (renamed from data/mapObjects/silphco11.asm)2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/SilphCo11F.asm
index e3cdd1a7..ec6331b2 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/SilphCo11F.asm
@@ -1,4 +1,4 @@
-SilphCo11Object:
+SilphCo11F_Object:
db $d ; border block
db 4 ; warps