diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/PokemonMansionB1F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/PokemonMansionB1F.asm (renamed from data/mapObjects/mansion4.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/PokemonMansionB1F.asm index 3db9d016..ac232799 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/PokemonMansionB1F.asm @@ -1,8 +1,8 @@ -Mansion4Object: +PokemonMansionB1F_Object: db $1 ; border block db 1 ; warps - warp 23, 22, 5, MANSION_1 + warp 23, 22, 5, POKEMON_MANSION_1F db 0 ; signs @@ -17,4 +17,4 @@ Mansion4Object: object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY ; warp-to - warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1 + warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F |