diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-18 23:39:29 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-18 23:39:29 -0500 |
| commit | 006507ed53349ce932681b1a40995b12d4ebf999 (patch) | |
| tree | 7ff3f0f28c70c162713c120571dc9c791848b19b | |
| parent | 4452acb021873affd95c92f096d0b1b9e8b50e7a (diff) | |
A few missed object constants
| -rwxr-xr-x | data/mapObjects/colosseum.asm | 2 | ||||
| -rwxr-xr-x | data/mapObjects/tradecenter.asm | 2 | ||||
| -rw-r--r-- | macros.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 0304368d..5be02b44 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -6,4 +6,4 @@ ColosseumObject: ; 0x4fd87 (size=10) db $0 ; signs db $1 ; objects - object SPRITE_RED, $2, $2, $ff, $0, $1 ; person + object SPRITE_RED, $2, $2, STAY, $0, $1 ; person diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index ff6fc5e3..57a3eee5 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -6,4 +6,4 @@ TradeCenterObject: ; 0x4fd53 (size=10) db $0 ; signs db $1 ; objects - object SPRITE_RED, $2, $2, $ff, $0, $1 ; person + object SPRITE_RED, $2, $2, STAY, $0, $1 ; person @@ -594,7 +594,7 @@ WEST_MAP_CONNECTION: MACRO db \2_WIDTH ; map width db (\3 - \4) * -2 ; y alignment db (\2_WIDTH * 2) - 1 ; x alignment - dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entring the map) + dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) ENDM ;\1 (byte) = current map id |