SetUpPuttingAwayDecorationPlayerAvatar and some related functions

3 files changed, 68 insertions, 215 deletions

diff --git a/asm/decoration.s b/asm/decoration.s
index 159b2eb03..bcf7e99cd 100755
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -8,221 +8,6 @@
 
 .equiv ewram_1f000, 0x0201f000
 
-	thumb_func_start sub_8100D38
-sub_8100D38: @ 8100D38
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	movs r2, 0
-	ldr r0, _08100D68 @ =ewram_1f000
-	adds r4, r0, 0
-	ldrb r0, [r4, 0x8]
-	cmp r2, r0
-	bcs _08100D7C
-	adds r5, r4, 0
-	ldr r1, _08100D6C @ =gTasks
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r1, r0, r1
-_08100D56:
-	ldr r0, [r5]
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08100D70
-	strh r2, [r1, 0x22]
-	movs r0, 0x1
-	b _08100D7E
-	.align 2, 0
-_08100D68: .4byte ewram_1f000
-_08100D6C: .4byte gTasks
-_08100D70:
-	adds r0, r2, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	ldrb r0, [r4, 0x8]
-	cmp r2, r0
-	bcc _08100D56
-_08100D7C:
-	movs r0, 0
-_08100D7E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8100D38
-
-	thumb_func_start SetUpPuttingAwayDecorationPlayerAvatar
-SetUpPuttingAwayDecorationPlayerAvatar: @ 8100D84
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	bl player_get_direction_lower_nybble
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	ldr r3, _08100DD8 @ =gUnknown_020391A8
-	ldr r2, _08100DDC @ =gSprites
-	ldr r4, _08100DE0 @ =gUnknown_03004880
-	ldr r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r0, [r0, 0x2E]
-	strb r0, [r3]
-	bl sub_81016C8
-	ldr r0, _08100DE4 @ =gSpriteTemplate_83ECA88
-	movs r1, 0x78
-	movs r2, 0x50
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r4, 0x4]
-	ldr r0, _08100DE8 @ =gSaveBlock2
-	ldrb r0, [r0, 0x8]
-	cmp r0, 0
-	bne _08100DF0
-	ldr r1, _08100DEC @ =SpriteCallbackDummy
-	str r0, [sp]
-	movs r0, 0xC1
-	b _08100DF8
-	.align 2, 0
-_08100DD8: .4byte gUnknown_020391A8
-_08100DDC: .4byte gSprites
-_08100DE0: .4byte gUnknown_03004880
-_08100DE4: .4byte gSpriteTemplate_83ECA88
-_08100DE8: .4byte gSaveBlock2
-_08100DEC: .4byte SpriteCallbackDummy
-_08100DF0:
-	ldr r1, _08100E5C @ =SpriteCallbackDummy
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xC2
-_08100DF8:
-	movs r2, 0x88
-	movs r3, 0x48
-	bl AddPseudoFieldObject
-	ldr r1, _08100E60 @ =gUnknown_020391A9
-	strb r0, [r1]
-	ldr r6, _08100E64 @ =gSprites
-	ldr r0, _08100E60 @ =gUnknown_020391A9
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldrb r2, [r1, 0x5]
-	movs r4, 0xD
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r2
-	movs r2, 0x4
-	mov r8, r2
-	mov r2, r8
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	ldr r5, _08100E68 @ =gUnknown_020391A8
-	ldrb r1, [r5]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	bl DestroySprite
-	ldr r0, _08100E6C @ =gUnknown_03004880
-	ldr r0, [r0, 0x4]
-	strb r0, [r5]
-	ldrb r1, [r5]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r1, [r0, 0x5]
-	ands r4, r1
-	mov r1, r8
-	orrs r4, r1
-	strb r4, [r0, 0x5]
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08100E5C: .4byte SpriteCallbackDummy
-_08100E60: .4byte gUnknown_020391A9
-_08100E64: .4byte gSprites
-_08100E68: .4byte gUnknown_020391A8
-_08100E6C: .4byte gUnknown_03004880
-	thumb_func_end SetUpPuttingAwayDecorationPlayerAvatar
-
-	thumb_func_start sub_8100E70
-sub_8100E70: @ 8100E70
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _08100E94 @ =gTasks + 0x8
-	adds r4, r0, r1
-	movs r1, 0x4
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _08100EC4
-	cmp r0, 0x1
-	bgt _08100E98
-	cmp r0, 0
-	beq _08100E9E
-	b _08100EE6
-	.align 2, 0
-_08100E94: .4byte gTasks + 0x8
-_08100E98:
-	cmp r0, 0x2
-	beq _08100ED2
-	b _08100EE6
-_08100E9E:
-	ldr r0, _08100EC0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08100EE6
-	adds r0, r5, 0
-	bl sub_80FF0E0
-	movs r0, 0x1
-	strh r0, [r4, 0x4]
-	strh r0, [r4, 0xC]
-	strh r0, [r4, 0xA]
-	bl sub_8072DEC
-	b _08100EE6
-	.align 2, 0
-_08100EC0: .4byte gPaletteFade
-_08100EC4:
-	bl SetUpPuttingAwayDecorationPlayerAvatar
-	bl pal_fill_black
-	movs r0, 0x2
-	strh r0, [r4, 0x4]
-	b _08100EE6
-_08100ED2:
-	bl sub_807D770
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08100EE6
-	strh r0, [r4, 0x18]
-	adds r0, r5, 0
-	bl sub_8100EEC
-_08100EE6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8100E70
-
 	thumb_func_start sub_8100EEC
 sub_8100EEC: @ 8100EEC
 	push {r4-r6,lr}
diff --git a/include/decoration.h b/include/decoration.h
index 594f7ef11..f55d868e8 100755
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -204,6 +204,7 @@ struct UnkStruct_020391B4
 extern const struct UnkStruct_083EC900 gUnknown_083EC900[10];
 extern const struct SpritePalette gUnknown_083EC954;
 extern const struct SpriteTemplate gSpriteTemplate_83EC93C;
+extern const struct SpriteTemplate gSpriteTemplate_83ECA88;
 
 extern struct Decoration gDecorations[0x77];
 extern struct UnkStruct_02038900 gUnknown_02038900;
@@ -305,7 +306,9 @@ void sub_81009A8(struct Sprite *);
 void sub_81009C0(struct Sprite *);
 bool8 sub_8100D38(u8);
 void sub_8100E70(u8);
+void sub_8100EEC(u8);
 void sub_81010F0(u8);
+void sub_81016C8(void);
 void sub_81016F4(void);
 
 #endif // GUARD_DECORATION_H
diff --git a/src/decoration.c b/src/decoration.c
index 6e8ba51e3..5f5c9eace 100755
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2147,3 +2147,68 @@ void sub_8100C88(u8 taskId)
             break;
     }
 }
+
+bool8 sub_8100D38(u8 taskId)
+{
+    u16 i;
+    for (i=0; i<ewram_1f000.size; i++)
+    {
+        if (ewram_1f000.items[i] != 0)
+        {
+            gTasks[taskId].data[13] = i;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+void SetUpPuttingAwayDecorationPlayerAvatar(void)
+{
+    player_get_direction_lower_nybble();
+    MenuZeroFillWindowRect(0, 0, 29, 19);
+    gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0;
+    sub_81016C8();
+    gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0);
+    if (gSaveBlock2.playerGender == MALE)
+    {
+        gUnknown_020391A9 = AddPseudoFieldObject(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0);
+    } else
+    {
+        gUnknown_020391A9 = AddPseudoFieldObject(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0);
+    }
+    gSprites[gUnknown_020391A9].oam.priority = 1;
+    DestroySprite(&gSprites[gUnknown_020391A8]);
+    gUnknown_020391A8 = gUnknown_03004880.unk4;
+    gSprites[gUnknown_020391A8].oam.priority = 1;
+}
+
+void sub_8100E70(u8 taskId)
+{
+    s16 *data;
+    data = gTasks[taskId].data;
+    switch (data[2])
+    {
+        case 0:
+            if (!gPaletteFade.active)
+            {
+                sub_80FF0E0(taskId);
+                data[2] = 1;
+                data[6] = 1;
+                data[5] = 1;
+                sub_8072DEC();
+            }
+            break;
+        case 1:
+            SetUpPuttingAwayDecorationPlayerAvatar();
+            pal_fill_black();
+            data[2] = 2;
+            break;
+        case 2:
+            if (sub_807D770() == TRUE)
+            {
+                data[12] = 1;
+                sub_8100EEC(taskId);
+            }
+            break;
+    }
+}