summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-06-12 22:44:45 -0500
committerBryan Bishop <kanzure@gmail.com>2013-06-12 22:44:45 -0500
commit4eebcf0ae2fc411916cdd44b4ca3ffdb1b6cca7b (patch)
tree20b8042fc2e6b723f8d9c9f4467a7da942ec0bc1 /wram.asm
parent358b5b074b45e4a484799fde4e18bc2cb4fec78b (diff)
parent6ba758aa53bbf14e2c152fd88f786a501f6bb029 (diff)
Merge remote-tracking branch 'yenatch/master'
Also merge pull request #145.
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm19
1 files changed, 19 insertions, 0 deletions
diff --git a/wram.asm b/wram.asm
index 653c2ae95..aaea09cbb 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1654,6 +1654,25 @@ Box13Name: ; dbe1
Box14Name: ; dbea
ds 9
+SECTION "decorations", BSS[$dc0f]
+; Sprite id of each decoration
+Bed: ; dc0f
+ ds 1
+Carpet: ; dc10
+ ds 1
+Plant: ; dc11
+ ds 1
+Poster: ; dc12
+ ds 1
+Console: ; dc13
+ ds 1
+LeftOrnament: ; dc14
+ ds 1
+RightOrnament: ; dc15
+ ds 1
+BigDoll: ; dc16
+ ds 1
+
SECTION "fruittrees", BSS[$dc27]
FruitTreeFlags: ; dc27
ds 1