diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/mansion4.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
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 bcd85206..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 ; POKEMON_MANSION_1F + warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F |