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 /src | |
| parent | 826664fbdab63fef78bd29d95cf06db5175d9e43 (diff) | |
| parent | 212bb0566f12c44685e39e3285d4332a88a8feb1 (diff) | |
Merge branch 'decoration_inventory'
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/decoration_inventory.c | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/menu.c | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/scrcmd.c | 0 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c index 879ceeb82..6463f50dc 100644..100755 --- a/src/decoration_inventory.c +++ b/src/decoration_inventory.c @@ -8,6 +8,19 @@ #include "decoration.h" #include "decoration_inventory.h" +#define DECOR_INV(ptr) {.items = (u8 *)&ptr, .size = sizeof ptr} + +struct DecorationInventory const gDecorationInventories[] = { + DECOR_INV(gSaveBlock1.decorDesk), + DECOR_INV(gSaveBlock1.decorChair), + DECOR_INV(gSaveBlock1.decorPlant), + DECOR_INV(gSaveBlock1.decorOrnament), + DECOR_INV(gSaveBlock1.decorMat), + DECOR_INV(gSaveBlock1.decorPoster), + DECOR_INV(gSaveBlock1.decorDoll), + DECOR_INV(gSaveBlock1.decorCushion) +}; + void ClearDecorationInventory(u8 invIdx) { u8 i; diff --git a/src/menu.c b/src/menu.c index 3acac88a0..3acac88a0 100644..100755 --- a/src/menu.c +++ b/src/menu.c diff --git a/src/scrcmd.c b/src/scrcmd.c index f2b5090af..f2b5090af 100644..100755 --- a/src/scrcmd.c +++ b/src/scrcmd.c |