diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/GameCorner.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/GameCorner.asm (renamed from data/mapObjects/celadongamecorner.asm) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm index be5a3c71..afac025e 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/GameCorner.asm @@ -1,10 +1,10 @@ -CeladonGameCornerObject: +GameCorner_Object: db $f ; border block db 3 ; warps warp 15, 17, 7, -1 warp 16, 17, 7, -1 - warp 17, 4, 1, ROCKET_HIDEOUT_1 + warp 17, 4, 1, ROCKET_HIDEOUT_B1F db 1 ; signs sign 9, 4, 12 ; CeladonGameCornerText12 |