hand cursor graphics

6 files changed, 70 insertions, 8 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 4ccb19aa0..c6a91d0a7 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -69262,8 +69262,8 @@ sub_809CC04: @ 809CC04
 	bl StartSpriteAnim
 	b _0809CCEE
 	.align 2, 0
-_0809CCB0: .4byte gUnknown_083BBBFC
-_0809CCB4: .4byte gUnknown_083BBC14
+_0809CCB0: .4byte gHandCursorSpriteSheets
+_0809CCB4: .4byte gHandCursorSpritePalettes
 _0809CCB8: .4byte 0x0000dac6
 _0809CCBC: .4byte gUnknown_083B6DB4
 _0809CCC0: .4byte 0x000011e4
diff --git a/data/data2.s b/data/data2.s
index 75d1a4b85..f77ecbb2e 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11610,7 +11610,20 @@ gSpriteTemplate_83BB2F0:: @ 83BB2F0
 	spr_template 6, 56015, gOamData_83BB2D0, gSpriteAnimTable_83BB2E8, NULL, gDummySpriteAffineAnimTable, sub_809A8C8
 
 	.align 2
-	.incbin "baserom.gba", 0x3bb308, 0x8c0
+HandCursorPalette: @ 83BB308
+	.incbin "graphics/pokemon_storage/hand_cursor.gbapal"
+
+	.align 2
+HandCursorAltPalette: @ 83BB328
+	.incbin "graphics/pokemon_storage/hand_cursor_alt.gbapal"
+
+	.align 2
+HandCursorTiles: @ 83BB348
+	.incbin "graphics/pokemon_storage/hand_cursor.4bpp"
+
+	.align 2
+HandCursorShadowTiles: @ 83BBB48
+	.incbin "graphics/pokemon_storage/hand_cursor_shadow.4bpp"
 
 	.align 2
 gUnknown_083BBBC8:: @ 83BBBC8
@@ -11618,14 +11631,25 @@ gUnknown_083BBBC8:: @ 83BBBC8
 	.4byte sub_809B1D8
 	.4byte sub_809B24C
 
+	.align 2
 gUnknown_083BBBD4:: @ 83BBBD4
-	.incbin "baserom.gba", 0x003bbbd4, 0x28
+	.4byte sub_809C464, 0
+	.4byte sub_809C664, 1
+	.4byte sub_809C85C, 2
+	.4byte sub_809C944, 3
+	.4byte NULL, 0
 
-gUnknown_083BBBFC:: @ 83BBBFC
-	.incbin "baserom.gba", 0x003bbbfc, 0x18
+	.align 2
+gHandCursorSpriteSheets:: @ 83BBBFC
+	obj_tiles HandCursorTiles, 0x800, 0
+	obj_tiles HandCursorShadowTiles, 0x80, 1
+	null_obj_tiles
 
-gUnknown_083BBC14:: @ 83BBC14
-	.incbin "baserom.gba", 0x003bbc14, 0x18
+	.align 2
+gHandCursorSpritePalettes:: @ 83BBC14
+	obj_pal HandCursorPalette, 56006
+	obj_pal HandCursorAltPalette, 56017
+	null_obj_pal
 
 	.align 2
 gOamData_83BBC2C:: @ 83BBC2C
diff --git a/graphics/pokemon_storage/hand_cursor.pal b/graphics/pokemon_storage/hand_cursor.pal
new file mode 100644
index 000000000..b38cf1e01
--- /dev/null
+++ b/graphics/pokemon_storage/hand_cursor.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 197 255
+255 255 255
+255 255 255
+222 222 246
+164 164 180
+148 148 172
+115 115 123
+82 82 90
+65 65 65
+180 230 115
+189 238 98
+148 205 57
+255 255 0
+90 189 238
+0 0 0
+0 0 0
diff --git a/graphics/pokemon_storage/hand_cursor.png b/graphics/pokemon_storage/hand_cursor.png
new file mode 100644
index 000000000..0f0e83a6d
--- /dev/null
+++ b/graphics/pokemon_storage/hand_cursor.png
diff --git a/graphics/pokemon_storage/hand_cursor_alt.pal b/graphics/pokemon_storage/hand_cursor_alt.pal
new file mode 100644
index 000000000..7dd606ad0
--- /dev/null
+++ b/graphics/pokemon_storage/hand_cursor_alt.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 197 255
+255 255 255
+255 230 90
+255 180 106
+255 164 0
+148 148 172
+115 115 123
+82 82 90
+65 65 65
+180 230 115
+189 238 98
+148 205 57
+255 255 0
+90 189 238
+0 0 0
+0 0 0
diff --git a/graphics/pokemon_storage/hand_cursor_shadow.png b/graphics/pokemon_storage/hand_cursor_shadow.png
new file mode 100644
index 000000000..5a051be64
--- /dev/null
+++ b/graphics/pokemon_storage/hand_cursor_shadow.png