Decoration + decoration_inventory (#89)

* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor

1 files changed, 0 insertions, 459 deletions

diff --git a/asm/decoration_inventory.s b/asm/decoration_inventory.s
deleted file mode 100644
index 7a909f585..000000000
--- a/asm/decoration_inventory.s
+++ /dev/null
@@ -1,459 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-    
-	thumb_func_start SetDecorationInventoriesPointers
-SetDecorationInventoriesPointers: @ 81617F4
-	push {r4,lr}
-	ldr r0, =gDecorationInventories
-	mov r12, r0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, =0x00002734
-	adds r0, r1, r2
-	mov r4, r12
-	str r0, [r4]
-	movs r3, 0xA
-	strb r3, [r4, 0x4]
-	adds r2, 0xA
-	adds r0, r1, r2
-	str r0, [r4, 0x8]
-	strb r3, [r4, 0xC]
-	ldr r4, =0x00002748
-	adds r0, r1, r4
-	mov r2, r12
-	str r0, [r2, 0x10]
-	strb r3, [r2, 0x14]
-	adds r4, 0xA
-	adds r0, r1, r4
-	str r0, [r2, 0x18]
-	movs r2, 0x1E
-	mov r0, r12
-	strb r2, [r0, 0x1C]
-	adds r4, 0x1E
-	adds r0, r1, r4
-	mov r4, r12
-	str r0, [r4, 0x20]
-	mov r0, r12
-	adds r0, 0x24
-	strb r2, [r0]
-	ldr r2, =0x0000278e
-	adds r0, r1, r2
-	str r0, [r4, 0x28]
-	mov r0, r12
-	adds r0, 0x2C
-	strb r3, [r0]
-	ldr r4, =0x00002798
-	adds r0, r1, r4
-	mov r2, r12
-	str r0, [r2, 0x30]
-	adds r2, 0x34
-	movs r0, 0x28
-	strb r0, [r2]
-	adds r4, 0x28
-	adds r1, r4
-	mov r0, r12
-	str r1, [r0, 0x38]
-	adds r0, 0x3C
-	strb r3, [r0]
-	bl sub_8126968
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetDecorationInventoriesPointers
-
-	thumb_func_start ClearDecorationInventory
-ClearDecorationInventory: @ 8161880
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r3, 0
-	ldr r1, =gDecorationInventories
-	lsrs r2, r0, 21
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcs _081618AA
-	adds r5, r1, 0
-	movs r4, 0
-_08161896:
-	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 _08161896
-_081618AA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearDecorationInventory
-
-	thumb_func_start ClearDecorationInventories
-ClearDecorationInventories: @ 81618B4
-	push {r4,lr}
-	movs r4, 0
-_081618B8:
-	adds r0, r4, 0
-	bl ClearDecorationInventory
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _081618B8
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end ClearDecorationInventories
-
-	thumb_func_start sub_81618D0
-sub_81618D0: @ 81618D0
-	push {r4,lr}
-	lsls r0, 24
-	movs r2, 0
-	ldr r1, =gDecorationInventories
-	lsrs r0, 21
-	adds r0, r1
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	cmp r2, r1
-	bge _0816190C
-	adds r4, r0, 0
-	adds r3, r1, 0
-_081618E8:
-	lsls r0, r2, 24
-	asrs r1, r0, 24
-	ldr r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08161900
-	adds r0, r1, 0
-	b _08161910
-	.pool
-_08161900:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	asrs r0, 24
-	cmp r0, r3
-	blt _081618E8
-_0816190C:
-	movs r0, 0x1
-	negs r0, r0
-_08161910:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81618D0
-
-	thumb_func_start CheckHasDecoration
-CheckHasDecoration: @ 8161918
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, =gDecorations
-	lsls r0, r3, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	movs r2, 0
-	ldr r1, =gDecorationInventories
-	lsls r0, 3
-	adds r0, r1
-	ldrb r1, [r0, 0x4]
-	cmp r2, r1
-	bcs _08161956
-	ldr r4, [r0]
-_08161936:
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _0816194C
-	movs r0, 0x1
-	b _08161958
-	.pool
-_0816194C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r1
-	bcc _08161936
-_08161956:
-	movs r0, 0
-_08161958:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end CheckHasDecoration
-
-	thumb_func_start DecorationAdd
-DecorationAdd: @ 8161960
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _081619A0
-	ldr r1, =gDecorations
-	lsls r0, r4, 5
-	adds r0, r1
-	ldrb r5, [r0, 0x13]
-	adds r0, r5, 0
-	bl sub_81618D0
-	lsls r0, 24
-	asrs r2, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r2, r0
-	beq _081619A0
-	ldr r0, =gDecorationInventories
-	lsls r1, r5, 3
-	adds r1, r0
-	ldr r0, [r1]
-	adds r0, r2
-	strb r4, [r0]
-	movs r0, 0x1
-	b _081619A2
-	.pool
-_081619A0:
-	movs r0, 0
-_081619A2:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end DecorationAdd
-
-	thumb_func_start DecorationCheckSpace
-DecorationCheckSpace: @ 81619A8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081619D4
-	ldr r1, =gDecorations
-	lsls r0, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	bl sub_81618D0
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	beq _081619D4
-	movs r0, 0x1
-	b _081619D6
-	.pool
-_081619D4:
-	movs r0, 0
-_081619D6:
-	pop {r1}
-	bx r1
-	thumb_func_end DecorationCheckSpace
-
-	thumb_func_start DecorationRemove
-DecorationRemove: @ 81619DC
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	cmp r5, 0
-	bne _081619F8
-	b _08161A26
-_081619EA:
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r6, 0
-	bl sub_8161A38
-	movs r0, 0x1
-	b _08161A28
-_081619F8:
-	ldr r2, =gDecorationInventories
-	ldr r1, =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 _08161A26
-	adds r6, r4, 0
-	adds r4, r0, 0
-	adds r2, r1, 0
-_08161A12:
-	ldr r0, [r4]
-	adds r1, r0, r3
-	ldrb r0, [r1]
-	cmp r0, r5
-	beq _081619EA
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r2
-	bcc _08161A12
-_08161A26:
-	movs r0, 0
-_08161A28:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end DecorationRemove
-
-	thumb_func_start sub_8161A38
-sub_8161A38: @ 8161A38
-	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, =gDecorationInventories
-	lsrs r0, 21
-	adds r1, r0, r2
-	ldrb r3, [r1, 0x4]
-	cmp r6, r3
-	bcs _08161ABC
-	adds r7, r0, 0
-	mov r10, r1
-	mov r0, r10
-	str r0, [sp]
-_08161A5C:
-	adds r1, r6, 0x1
-	lsls r0, r1, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r12, r1
-	mov r1, r10
-	ldrb r1, [r1, 0x4]
-	cmp r3, r1
-	bcs _08161AAE
-	ldr r0, =gDecorationInventories
-	mov r9, r0
-	adds r1, r0, 0
-	mov r8, r1
-_08161A76:
-	mov r0, r9
-	adds r5, r2, r0
-	ldr r1, [r5]
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	adds r2, r4, 0
-	cmp r2, 0
-	beq _08161A9C
-	adds r0, r1, r6
-	ldrb r1, [r0]
-	cmp r1, 0
-	beq _08161A92
-	cmp r1, r2
-	bls _08161A9C
-_08161A92:
-	ldrb r1, [r0]
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, r3
-	strb r1, [r0]
-_08161A9C:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r1, r8
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _08161A76
-_08161AAE:
-	mov r3, r12
-	lsls r0, r3, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp]
-	ldrb r0, [r0, 0x4]
-	cmp r6, r0
-	bcc _08161A5C
-_08161ABC:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8161A38
-
-	thumb_func_start sub_8161AD0
-sub_8161AD0: @ 8161AD0
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r4, 0
-	movs r3, 0
-	ldr r2, =gDecorationInventories
-	lsrs r1, r0, 21
-	adds r0, r1, r2
-	ldrb r0, [r0, 0x4]
-	cmp r4, r0
-	bcs _08161B04
-	adds r5, r2, 0
-_08161AE6:
-	adds r2, r1, r5
-	ldr r0, [r2]
-	adds r0, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08161AF8
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-_08161AF8:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r2, [r2, 0x4]
-	cmp r3, r2
-	bcc _08161AE6
-_08161B04:
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8161AD0
-
-	thumb_func_start sub_8161B10
-sub_8161B10: @ 8161B10
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0
-_08161B16:
-	adds r0, r4, 0
-	bl sub_8161AD0
-	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 _08161B16
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8161B10
-
-	.align 2, 0 @ Don't pad with nop.
-    
\ No newline at end of file