Decompile asm/decoration_inventory.s

4 files changed, 165 insertions, 405 deletions

diff --git a/asm/decoration_inventory.s b/asm/decoration_inventory.s
deleted file mode 100644
index 953d770ae..000000000
--- a/asm/decoration_inventory.s
+++ /dev/null
@@ -1,404 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-	
-	thumb_func_start ClearDecorationInventory
-ClearDecorationInventory: @ 8133F4C
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r3, 0
-	ldr r1, _08133F7C @ =gDecorationInventories
-	lsrs r2, r0, 21
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcs _08133F76
-	adds r5, r1, 0
-	movs r4, 0
-_08133F62:
-	adds r0, r2, r5
-	ldr r1, [r0]
-	adds r1, r3
-	strb r4, [r1]
-	adds r1, r3, 0x1
-	lsls r1, 24
-	lsrs r3, r1, 24
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _08133F62
-_08133F76:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08133F7C: .4byte gDecorationInventories
-	thumb_func_end ClearDecorationInventory
-
-	thumb_func_start ClearDecorationInventories
-ClearDecorationInventories: @ 8133F80
-	push {r4,lr}
-	movs r4, 0
-_08133F84:
-	adds r0, r4, 0
-	bl ClearDecorationInventory
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _08133F84
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end ClearDecorationInventories
-
-	thumb_func_start sub_8133F9C
-sub_8133F9C: @ 8133F9C
-	push {r4,lr}
-	lsls r0, 24
-	movs r2, 0
-	ldr r1, _08133FC8 @ =gDecorationInventories
-	lsrs r0, 21
-	adds r0, r1
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	cmp r2, r1
-	bge _08133FD8
-	adds r4, r0, 0
-	adds r3, r1, 0
-_08133FB4:
-	lsls r0, r2, 24
-	asrs r1, r0, 24
-	ldr r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08133FCC
-	adds r0, r1, 0
-	b _08133FDC
-	.align 2, 0
-_08133FC8: .4byte gDecorationInventories
-_08133FCC:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	asrs r0, 24
-	cmp r0, r3
-	blt _08133FB4
-_08133FD8:
-	movs r0, 0x1
-	negs r0, r0
-_08133FDC:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8133F9C
-
-	thumb_func_start sub_8133FE4
-sub_8133FE4: @ 8133FE4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, _08134010 @ =gDecorations
-	lsls r0, r3, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	movs r2, 0
-	ldr r1, _08134014 @ =gDecorationInventories
-	lsls r0, 3
-	adds r0, r1
-	ldrb r1, [r0, 0x4]
-	cmp r2, r1
-	bcs _08134022
-	ldr r4, [r0]
-_08134002:
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _08134018
-	movs r0, 0x1
-	b _08134024
-	.align 2, 0
-_08134010: .4byte gDecorations
-_08134014: .4byte gDecorationInventories
-_08134018:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r1
-	bcc _08134002
-_08134022:
-	movs r0, 0
-_08134024:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8133FE4
-
-	thumb_func_start IsThereStorageSpaceForDecoration
-IsThereStorageSpaceForDecoration: @ 813402C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _0813406C
-	ldr r1, _08134064 @ =gDecorations
-	lsls r0, r4, 5
-	adds r0, r1
-	ldrb r5, [r0, 0x13]
-	adds r0, r5, 0
-	bl sub_8133F9C
-	lsls r0, 24
-	asrs r2, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r2, r0
-	beq _0813406C
-	ldr r0, _08134068 @ =gDecorationInventories
-	lsls r1, r5, 3
-	adds r1, r0
-	ldr r0, [r1]
-	adds r0, r2
-	strb r4, [r0]
-	movs r0, 0x1
-	b _0813406E
-	.align 2, 0
-_08134064: .4byte gDecorations
-_08134068: .4byte gDecorationInventories
-_0813406C:
-	movs r0, 0
-_0813406E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end IsThereStorageSpaceForDecoration
-
-	thumb_func_start sub_8134074
-sub_8134074: @ 8134074
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081340A0
-	ldr r1, _0813409C @ =gDecorations
-	lsls r0, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	bl sub_8133F9C
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	beq _081340A0
-	movs r0, 0x1
-	b _081340A2
-	.align 2, 0
-_0813409C: .4byte gDecorations
-_081340A0:
-	movs r0, 0
-_081340A2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8134074
-
-	thumb_func_start sub_81340A8
-sub_81340A8: @ 81340A8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	cmp r5, 0
-	bne _081340C4
-	b _081340F2
-_081340B6:
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r6, 0
-	bl sub_8134104
-	movs r0, 0x1
-	b _081340F4
-_081340C4:
-	ldr r2, _081340FC @ =gDecorationInventories
-	ldr r1, _08134100 @ =gDecorations
-	lsls r0, r5, 5
-	adds r0, r1
-	ldrb r4, [r0, 0x13]
-	lsls r0, r4, 3
-	adds r0, r2
-	ldrb r1, [r0, 0x4]
-	cmp r3, r1
-	bcs _081340F2
-	adds r6, r4, 0
-	adds r4, r0, 0
-	adds r2, r1, 0
-_081340DE:
-	ldr r0, [r4]
-	adds r1, r0, r3
-	ldrb r0, [r1]
-	cmp r0, r5
-	beq _081340B6
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r2
-	bcc _081340DE
-_081340F2:
-	movs r0, 0
-_081340F4:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081340FC: .4byte gDecorationInventories
-_08134100: .4byte gDecorations
-	thumb_func_end sub_81340A8
-
-	thumb_func_start sub_8134104
-sub_8134104: @ 8134104
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	movs r6, 0
-	ldr r2, _08134190 @ =gDecorationInventories
-	lsrs r1, r0, 21
-	adds r0, r1, r2
-	ldrb r0, [r0, 0x4]
-	cmp r6, r0
-	bcs _08134180
-	adds r7, r1, 0
-	mov r8, r0
-	str r0, [sp]
-_08134126:
-	adds r1, r6, 0x1
-	lsls r0, r1, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r12, r1
-	cmp r3, r8
-	bcs _08134174
-	ldr r1, _08134190 @ =gDecorationInventories
-	mov r10, r1
-	adds r0, r1, 0
-	mov r9, r0
-_0813413C:
-	mov r1, r10
-	adds r5, r2, r1
-	ldr r1, [r5]
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	adds r2, r4, 0
-	cmp r2, 0
-	beq _08134162
-	adds r0, r1, r6
-	ldrb r1, [r0]
-	cmp r1, 0
-	beq _08134158
-	cmp r1, r2
-	bls _08134162
-_08134158:
-	ldrb r1, [r0]
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, r3
-	strb r1, [r0]
-_08134162:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r1, r9
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _0813413C
-_08134174:
-	mov r1, r12
-	lsls r0, r1, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp]
-	cmp r6, r0
-	bcc _08134126
-_08134180:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08134190: .4byte gDecorationInventories
-	thumb_func_end sub_8134104
-
-	thumb_func_start sub_8134194
-sub_8134194: @ 8134194
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r4, 0
-	movs r3, 0
-	ldr r2, _081341D0 @ =gDecorationInventories
-	lsrs r1, r0, 21
-	adds r0, r1, r2
-	ldrb r0, [r0, 0x4]
-	cmp r4, r0
-	bcs _081341C8
-	adds r5, r2, 0
-_081341AA:
-	adds r2, r1, r5
-	ldr r0, [r2]
-	adds r0, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _081341BC
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-_081341BC:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r2, [r2, 0x4]
-	cmp r3, r2
-	bcc _081341AA
-_081341C8:
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081341D0: .4byte gDecorationInventories
-	thumb_func_end sub_8134194
-
-	thumb_func_start sub_81341D4
-sub_81341D4: @ 81341D4
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0
-_081341DA:
-	adds r0, r4, 0
-	bl sub_8134194
-	adds r0, r5, r0
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _081341DA
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81341D4
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h
new file mode 100644
index 000000000..dd87e7239
--- /dev/null
+++ b/include/decoration_inventory.h
@@ -0,0 +1,8 @@
+//
+// Created by Scott Norton on 6/5/17.
+//
+
+#ifndef POKERUBY_DECORATION_INVENTORY_H
+#define POKERUBY_DECORATION_INVENTORY_H
+
+#endif //POKERUBY_DECORATION_INVENTORY_H
diff --git a/ld_script.txt b/ld_script.txt
index 687280f94..b4c30ad57 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -253,7 +253,7 @@ SECTIONS {
         asm/battle_anim_812C144.o(.text);
         asm/learn_move.o(.text);
         src/fldeff_softboiled.o(.text);
-        asm/decoration_inventory.o(.text);
+        src/decoration_inventory.o(.text);
         src/roamer.o(.text);
         asm/battle_tower.o(.text);
         asm/use_pokeblock.o(.text);
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
new file mode 100644
index 000000000..a483629b1
--- /dev/null
+++ b/src/decoration_inventory.c
@@ -0,0 +1,156 @@
+//
+// Created by Scott Norton on 6/5/17.
+//
+
+#include "global.h"
+#include "sprite.h"
+#include "task.h"
+#include "decoration.h"
+#include "decoration_inventory.h"
+
+void ClearDecorationInventory(u8 invIdx)
+{
+    u8 i;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        gDecorationInventories[invIdx].items[i] = DECOR_NONE;
+    }
+}
+
+void ClearDecorationInventories(void)
+{
+    u8 i;
+    for (i=0; i<8; i++)
+    {
+        ClearDecorationInventory(i);
+    }
+}
+
+s8 sub_8133F9C(u8 invIdx)
+{
+    s8 i;
+    for (i=0; i<(s8)gDecorationInventories[invIdx].size; i++)
+    {
+        if (gDecorationInventories[invIdx].items[i] == DECOR_NONE)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+bool8 sub_8133FE4(u8 decorIdx)
+{
+    u8 invIdx;
+    u8 i;
+    invIdx = gDecorations[decorIdx].decor_field_13;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        if (gDecorationInventories[invIdx].items[i] == decorIdx)
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool8 IsThereStorageSpaceForDecoration(u8 decorIdx)
+{
+    u8 invIdx;
+    s8 invSlot;
+    if (decorIdx == DECOR_NONE)
+    {
+        return FALSE;
+    }
+    invIdx = gDecorations[decorIdx].decor_field_13;
+    invSlot = sub_8133F9C(invIdx);
+    if (invSlot == -1)
+    {
+        return FALSE;
+    }
+    gDecorationInventories[invIdx].items[invSlot] = decorIdx;
+    return TRUE;
+}
+
+bool8 sub_8134074(u8 decorIdx)
+{
+    u8 invIdx;
+    if (decorIdx == DECOR_NONE)
+    {
+        return FALSE;
+    }
+    invIdx = gDecorations[decorIdx].decor_field_13;
+    if (sub_8133F9C(invIdx) == -1)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 sub_81340A8(u8 decorIdx)
+{
+    u8 i;
+    u8 invIdx;
+    i = 0;
+    if (decorIdx == DECOR_NONE)
+    {
+        return FALSE;
+    }
+    for (i=0; i<gDecorationInventories[gDecorations[decorIdx].decor_field_13].size; i++)
+    {
+        invIdx = gDecorations[decorIdx].decor_field_13;
+        if (gDecorationInventories[invIdx].items[i] == decorIdx)
+        {
+            gDecorationInventories[invIdx].items[i] = DECOR_NONE;
+            sub_8134104(invIdx);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+void sub_8134104(u8 invIdx)
+{
+    u8 i;
+    u8 j;
+    u8 tmp;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        for (j=i+1; j<gDecorationInventories[invIdx].size; j++)
+        {
+            if (gDecorationInventories[invIdx].items[j] != 0 && (gDecorationInventories[invIdx].items[i] == DECOR_NONE || gDecorationInventories[invIdx].items[i] > gDecorationInventories[invIdx].items[j]))
+            {
+                tmp = gDecorationInventories[invIdx].items[i];
+                gDecorationInventories[invIdx].items[i] = gDecorationInventories[invIdx].items[j];
+                gDecorationInventories[invIdx].items[j] = tmp;
+            }
+        }
+    }
+}
+
+u8 sub_8134194(u8 invIdx)
+{
+    u8 i;
+    u8 count;
+    count = 0;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        if (gDecorationInventories[invIdx].items[i] != 0)
+        {
+            count++;
+        }
+    }
+    return count;
+}
+
+u8 sub_81341D4(void)
+{
+    u8 i;
+    u8 count;
+    count = 0;
+    for (i=0; i<8; i++)
+    {
+        count += sub_8134194(i);
+    }
+    return count;
+}