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/SSAnneKitchen.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/SSAnneKitchen.asm (renamed from data/mapObjects/ssanne6.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/SSAnneKitchen.asm index a25fe9b3..b5771e68 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/SSAnneKitchen.asm @@ -1,8 +1,8 @@ -SSAnne6Object: +SSAnneKitchen_Object: db $c ; border block db 1 ; warps - warp 6, 0, 10, SS_ANNE_1 + warp 6, 0, 10, SS_ANNE_1F db 0 ; signs @@ -16,4 +16,4 @@ SSAnne6Object: object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person ; warp-to - warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1 + warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F |