diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-13 22:01:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-13 22:01:54 -0400 |
| commit | b585b9ac289ed906bb7cb6ea3ad033d69b2230cb (patch) | |
| tree | c2dfa887756cbf41fb89b9f206c31f9247e82652 /data | |
| parent | 826664fbdab63fef78bd29d95cf06db5175d9e43 (diff) | |
| parent | 212bb0566f12c44685e39e3285d4332a88a8feb1 (diff) | |
Merge branch 'decoration_inventory'
Diffstat (limited to 'data')
| -rw-r--r-- | data/decoration_inventory.s | 16 |
1 files changed, 0 insertions, 16 deletions
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 |