Merge remote-tracking branch 'origin/master'

4 files changed, 29 insertions, 12 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 816db74af..c085f778f 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -387012,8 +387012,8 @@ _081371AC:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_081371C0: .4byte gUnknown_08406148
-_081371C4: .4byte gUnknown_08406150
+_081371C0: .4byte gSpriteSheet_ConditionUpDown
+_081371C4: .4byte gSpritePalette_ConditionUpDown
 _081371C8: .4byte 0x02039304
 _081371CC: .4byte gUnknown_08406158
 _081371D0: .4byte 0x02020020
diff --git a/data/data2.s b/data/data2.s
index ef75f3141..128c03feb 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -26912,14 +26912,12 @@ gUnknown_08405EE6:: @ 8405EE6
 	.incbin "baserom.gba", 0x00405ee6, 0x12
 
 	.align 2
-gUnknownPal_08405EF8::
-	.incbin "baserom.gba", 0x00405ef8, 0x20
+ConditionUpDownPalette:
+	.incbin "graphics/misc/condition_up_down.gbapal"
 
 	.align 2
-gUnknownPal_08405F18::
-	.incbin "baserom.gba", 0x00405f18, 0x20
-
-	.incbin "baserom.gba", 0x00405f38, 0x1E0
+ConditionUpDownTiles:
+	.incbin "graphics/misc/condition_up_down.4bpp"
 
 gUnknown_08406118:: @ 8406118
 	.incbin "baserom.gba", 0x00406118, 0x14
@@ -26937,12 +26935,12 @@ gUnknown_08406134:: @ 8406134
 	.4byte OtherText_Beauty
 
 	.align 2
-gUnknown_08406148:: @ 8406148
-	obj_pal gUnknownPal_08405F18, 0x0200
+gSpriteSheet_ConditionUpDown:: @ 8406148
+	obj_tiles ConditionUpDownTiles, 0x200, 0
 
 	.align 2
-gUnknown_08406150:: @ 8406150
-	obj_pal gUnknownPal_08405EF8, 0x0000
+gSpritePalette_ConditionUpDown:: @ 8406150
+	obj_pal ConditionUpDownPalette, 0
 
 gUnknown_08406158:: @ 8406158
 	.incbin "baserom.gba", 0x00406158, 0x14
diff --git a/graphics/misc/condition_up_down.pal b/graphics/misc/condition_up_down.pal
new file mode 100644
index 000000000..5b0cfcd3c
--- /dev/null
+++ b/graphics/misc/condition_up_down.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 180 246
+255 255 0
+255 0 0
+0 0 255
+222 222 222
+213 213 213
+205 205 205
+197 197 197
+189 189 189
+180 180 180
+172 172 172
+164 164 164
+148 148 148
+139 139 139
+131 131 131
+0 0 0
diff --git a/graphics/misc/condition_up_down.png b/graphics/misc/condition_up_down.png
new file mode 100644
index 000000000..7d4049d86
--- /dev/null
+++ b/graphics/misc/condition_up_down.png