Merge pull request #95 from PikalaxALT/decoration

Move these palettes to INCBINs

asm/trader.s

@@ -433,15 +433,15 @@ sub_8133DA0: @ 8133DA0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
-	bl sub_81279C4
+	bl IsSelectedDecorInThePC
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _08133DFC
 	ldr r5, =gSpecialVar_0x8006
-	ldr r0, =gUnknown_0203A172
+	ldr r0, =gCurDecorationIndex
 	ldrb r1, [r0]
-	ldr r0, =gUnknown_0203A14C
+	ldr r0, =gCurDecorInventoryItems
 	ldr r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]

data/strings.s

@@ -1517,52 +1517,52 @@ gUnknown_085EA79D:: @ 85EA79D
 gUnknown_085EA7A9:: @ 85EA7A9
 	.string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$"
 
-gUnknown_085EA7B1:: @ 85EA7B1
+gText_Decorate:: @ 85EA7B1
 	.string "DECORATE$"
 
-gUnknown_085EA7BA:: @ 85EA7BA
+gText_PutAway:: @ 85EA7BA
 	.string "PUT AWAY$"
 
-gUnknown_085EA7C3:: @ 85EA7C3
+gText_Toss2:: @ 85EA7C3
 	.string "TOSS$"
 
 gText_Color161Shadow161:: @ 85EA7C8
 	.string "{COLOR 161}{SHADOW 161}$"
 
-gUnknown_085EA7CF:: @ 85EA7CF
+gText_PutOutSelectedDecorItem:: @ 85EA7CF
 	.string "Put out the selected decoration item.$"
 
-gUnknown_085EA7F5:: @ 85EA7F5
+gText_StoreChosenDecorInPC:: @ 85EA7F5
 	.string "Store the chosen decoration in the PC.$"
 
-gUnknown_085EA81C:: @ 85EA81C
+gText_ThrowAwayUnwantedDecors:: @ 85EA81C
 	.string "Throw away unwanted decorations.$"
 
 gText_NoDecorations:: @ 85EA83D
 	.string "There are no decorations.{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_085EA859:: @ 85EA859
+gText_Desk:: @ 85EA859
 	.string "DESK$"
 
-gUnknown_085EA85E:: @ 85EA85E
+gText_Chair:: @ 85EA85E
 	.string "CHAIR$"
 
-gUnknown_085EA864:: @ 85EA864
+gText_Plant:: @ 85EA864
 	.string "PLANT$"
 
-gUnknown_085EA86A:: @ 85EA86A
+gText_Ornament:: @ 85EA86A
 	.string "ORNAMENT$"
 
-gUnknown_085EA873:: @ 85EA873
+gText_Mat:: @ 85EA873
 	.string "MAT$"
 
-gUnknown_085EA877:: @ 85EA877
+gText_Poster:: @ 85EA877
 	.string "POSTER$"
 
-gUnknown_085EA87E:: @ 85EA87E
+gText_Doll:: @ 85EA87E
 	.string "DOLL$"
 
-gUnknown_085EA883:: @ 85EA883
+gText_Cushion:: @ 85EA883
 	.string "CUSHION$"
 
 gText_Gold:: @ 85EA88B

graphics/decorations/unk_85a6bb0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 230 230
+197 197 197
+0 0 0
+238 238 238
+197 197 197
+148 148 148
+255 0 0
+180 0 0
+255 197 197
+82 82 255
+49 49 180
+197 197 255

graphics/decorations/unk_85a7308.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+255 197 148
+222 148 115
+123 65 65
+57 74 123
+41 57 98
+24 41 82
+16 32 57
+222 230 238
+255 197 90
+189 156 90
+255 98 90
+197 65 65
+255 255 255
+0 0 0

graphics/decorations/unk_85a7328.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 222 205
+222 164 148
+205 131 115
+123 90 82
+98 98 115
+41 57 65
+164 106 82
+74 49 57
+205 205 222
+255 197 90
+189 156 90
+255 98 90
+197 65 65
+255 255 255
+0 0 0

include/decoration.h

@@ -187,8 +187,8 @@ struct DecorPCPointers
 };
 
 extern const struct Decoration gDecorations[];
-extern EWRAM_DATA u8 *gUnknown_0203A14C;
-extern EWRAM_DATA u8 gUnknown_0203A172;
+extern EWRAM_DATA u8 *gCurDecorInventoryItems;
+extern EWRAM_DATA u8 gCurDecorationIndex;
 
 void sub_8126968(void);
 

include/global.h

@@ -12,8 +12,10 @@
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
 
 #if defined (__APPLE__) || defined (__CYGWIN__)
-void memset(void *, int, size_t);
-void memcpy(void *, const void *, size_t);
+void *memset(void *, int, size_t);
+void *memcpy(void *, const void *, size_t);
+int strcmp(const char *s1, const char *s2);
+char* strcpy(char *dst0, const char *src0);
 #endif // __APPLE__
 
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))

include/strings.h

@@ -56,19 +56,19 @@ extern const u8 gText_NoDecorationHere[];
 extern const u8 gText_DecorationWillBeDiscarded[];
 extern const u8 gText_CantThrowAwayInUse[];
 extern const u8 gText_DecorationThrownAway[];
-extern const u8 gUnknown_085EA859[];
-extern const u8 gUnknown_085EA85E[];
-extern const u8 gUnknown_085EA864[];
-extern const u8 gUnknown_085EA86A[];
-extern const u8 gUnknown_085EA873[];
-extern const u8 gUnknown_085EA877[];
-extern const u8 gUnknown_085EA7CF[];
-extern const u8 gUnknown_085EA7F5[];
-extern const u8 gUnknown_085EA81C[];
-extern const u8 gUnknown_085EA87E[];
-extern const u8 gUnknown_085EA883[];
-extern const u8 gUnknown_085EA7B1[];
-extern const u8 gUnknown_085EA7BA[];
-extern const u8 gUnknown_085EA7C3[];
+extern const u8 gText_Desk[];
+extern const u8 gText_Chair[];
+extern const u8 gText_Plant[];
+extern const u8 gText_Ornament[];
+extern const u8 gText_Mat[];
+extern const u8 gText_Poster[];
+extern const u8 gText_PutOutSelectedDecorItem[];
+extern const u8 gText_StoreChosenDecorInPC[];
+extern const u8 gText_ThrowAwayUnwantedDecors[];
+extern const u8 gText_Doll[];
+extern const u8 gText_Cushion[];
+extern const u8 gText_Decorate[];
+extern const u8 gText_PutAway[];
+extern const u8 gText_Toss2[];
 
 #endif //GUARD_STRINGS_H