summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-13 19:28:50 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-13 19:28:50 -0400
commit355498d85b71536580025364ccaa5ceb94c4194d (patch)
treedaf27a8cb8ad3a1258476a9ac693b97c5a9dc183 /data
parent454d7bbdd7ee6c5cb61680da855755869662968f (diff)
Decoration inventory data
Diffstat (limited to 'data')
-rwxr-xr-x[-rw-r--r--]data/decoration.s0
-rw-r--r--data/decoration_inventory.s16
-rwxr-xr-x[-rw-r--r--]data/decorations.inc0
3 files changed, 0 insertions, 16 deletions
diff --git a/data/decoration.s b/data/decoration.s
index d37e41823..d37e41823 100644..100755
--- a/data/decoration.s
+++ b/data/decoration.s
diff --git a/data/decoration_inventory.s b/data/decoration_inventory.s
deleted file mode 100644
index a70dedbe5..000000000
--- a/data/decoration_inventory.s
+++ /dev/null
@@ -1,16 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-@ pointer to decorations, capacity
- .align 2
-gDecorationInventories:: @ 8402E40
- .4byte gSaveBlock1 + 0x26A0, 10 @ DESK
- .4byte gSaveBlock1 + 0x26AA, 10 @ CHAIR
- .4byte gSaveBlock1 + 0x26B4, 10 @ PLANT
- .4byte gSaveBlock1 + 0x26BE, 30 @ ORNAMENT
- .4byte gSaveBlock1 + 0x26DC, 30 @ MAT
- .4byte gSaveBlock1 + 0x26FA, 10 @ POSTER
- .4byte gSaveBlock1 + 0x2704, 40 @ DOLL
- .4byte gSaveBlock1 + 0x272C, 10 @ CUSHION
diff --git a/data/decorations.inc b/data/decorations.inc
index 268ebee9a..268ebee9a 100644..100755
--- a/data/decorations.inc
+++ b/data/decorations.inc