Merge pull request #423 from DizzyEggg/ornament

Move Ornament data and graphics to C / RGB clean-up
2026-09-14 12:05:51 -05:00 · 2025-07-08 09:26:07 -07:00
parent 0ee86ef843 cf842ce3a1
commit 22e3b1c8f8
439 changed files with 6743 additions and 5814 deletions
--- a/data/data.s
+++ b/data/data.s
@@ -2,9 +2,6 @@

 	.align 2, 0

-@ ???
-.string "pksdir0\0"
-
@ ???
 .string "pksdir0\0"
    .fill 28, 1, 0
--- a/data/ornament_sbin.s
+++ b/data/ornament_sbin.s
--- a/data/unk_9E7EB08.s
+++ b/data/unk_9E7EB08.s
@@ -0,0 +1,5 @@
+.section .rodata
+    
+.align 2
+
+.incbin "baserom.gba", 0x1E7EB08, 0x14F8
--- a/graphics/ornament/Flag00/sprite_1.png
+++ b/graphics/ornament/Flag00/sprite_1.png
--- a/graphics/ornament/Flag00/sprite_2.png
+++ b/graphics/ornament/Flag00/sprite_2.png
--- a/graphics/ornament/Flag00/sprite_3.png
+++ b/graphics/ornament/Flag00/sprite_3.png
--- a/graphics/ornament/Flag00/sprite_4.png
+++ b/graphics/ornament/Flag00/sprite_4.png
--- a/graphics/ornament/Flag00/sprite_5.png
+++ b/graphics/ornament/Flag00/sprite_5.png
--- a/graphics/ornament/Flag00/sprite_6.png
+++ b/graphics/ornament/Flag00/sprite_6.png
--- a/graphics/ornament/Flag00/sprite_6_2.png
+++ b/graphics/ornament/Flag00/sprite_6_2.png
--- a/graphics/ornament/Flag01/sprite_1.png
+++ b/graphics/ornament/Flag01/sprite_1.png
--- a/graphics/ornament/Flag01/sprite_1_2.png
+++ b/graphics/ornament/Flag01/sprite_1_2.png
--- a/graphics/ornament/Flag01/sprite_2.png
+++ b/graphics/ornament/Flag01/sprite_2.png
--- a/graphics/ornament/Flag01/sprite_2_2.png
+++ b/graphics/ornament/Flag01/sprite_2_2.png
--- a/graphics/ornament/Flag01/sprite_3.png
+++ b/graphics/ornament/Flag01/sprite_3.png
--- a/graphics/ornament/Flag01/sprite_3_2.png
+++ b/graphics/ornament/Flag01/sprite_3_2.png
--- a/graphics/ornament/Flag01/sprite_4.png
+++ b/graphics/ornament/Flag01/sprite_4.png
--- a/graphics/ornament/Flag01/sprite_4_2.png
+++ b/graphics/ornament/Flag01/sprite_4_2.png
--- a/graphics/ornament/Flag01/sprite_5.png
+++ b/graphics/ornament/Flag01/sprite_5.png
--- a/graphics/ornament/Flag01/sprite_5_2.png
+++ b/graphics/ornament/Flag01/sprite_5_2.png
--- a/graphics/ornament/Flag01/sprite_6.png
+++ b/graphics/ornament/Flag01/sprite_6.png
--- a/graphics/ornament/Flag01/sprite_6_2.png
+++ b/graphics/ornament/Flag01/sprite_6_2.png
--- a/graphics/ornament/Flag02/sprite_1.png
+++ b/graphics/ornament/Flag02/sprite_1.png
--- a/graphics/ornament/Flag02/sprite_2.png
+++ b/graphics/ornament/Flag02/sprite_2.png
--- a/graphics/ornament/Flag02/sprite_3.png
+++ b/graphics/ornament/Flag02/sprite_3.png
--- a/graphics/ornament/Flag02/sprite_4.png
+++ b/graphics/ornament/Flag02/sprite_4.png
--- a/graphics/ornament/Flag02/sprite_5.png
+++ b/graphics/ornament/Flag02/sprite_5.png
--- a/graphics/ornament/Flag02/sprite_6.png
+++ b/graphics/ornament/Flag02/sprite_6.png
--- a/graphics/ornament/Flag03/sprite_1.png
+++ b/graphics/ornament/Flag03/sprite_1.png
--- a/graphics/ornament/Flag03/sprite_1_2.png
+++ b/graphics/ornament/Flag03/sprite_1_2.png
--- a/graphics/ornament/Flag03/sprite_2.png
+++ b/graphics/ornament/Flag03/sprite_2.png
--- a/graphics/ornament/Flag03/sprite_2_2.png
+++ b/graphics/ornament/Flag03/sprite_2_2.png
--- a/graphics/ornament/Flag03/sprite_3.png
+++ b/graphics/ornament/Flag03/sprite_3.png
--- a/graphics/ornament/Flag03/sprite_3_2.png
+++ b/graphics/ornament/Flag03/sprite_3_2.png
--- a/graphics/ornament/Flag03/sprite_4.png
+++ b/graphics/ornament/Flag03/sprite_4.png
--- a/graphics/ornament/Flag03/sprite_4_2.png
+++ b/graphics/ornament/Flag03/sprite_4_2.png
--- a/graphics/ornament/Flag03/sprite_5.png
+++ b/graphics/ornament/Flag03/sprite_5.png
--- a/graphics/ornament/Flag03/sprite_5_2.png
+++ b/graphics/ornament/Flag03/sprite_5_2.png
--- a/graphics/ornament/Flag03/sprite_6.png
+++ b/graphics/ornament/Flag03/sprite_6.png
--- a/graphics/ornament/Flag03/sprite_6_2.png
+++ b/graphics/ornament/Flag03/sprite_6_2.png
--- a/graphics/ornament/Flag04/sprite_1.png
+++ b/graphics/ornament/Flag04/sprite_1.png
--- a/graphics/ornament/Flag04/sprite_2.png
+++ b/graphics/ornament/Flag04/sprite_2.png
--- a/graphics/ornament/Flag04/sprite_3.png
+++ b/graphics/ornament/Flag04/sprite_3.png
--- a/graphics/ornament/Flag04/sprite_4.png
+++ b/graphics/ornament/Flag04/sprite_4.png
--- a/graphics/ornament/Flag04/sprite_5.png
+++ b/graphics/ornament/Flag04/sprite_5.png
--- a/graphics/ornament/Flag04/sprite_6.png
+++ b/graphics/ornament/Flag04/sprite_6.png
--- a/graphics/ornament/Flag05/sprite_1.png
+++ b/graphics/ornament/Flag05/sprite_1.png
--- a/graphics/ornament/Flag05/sprite_2.png
+++ b/graphics/ornament/Flag05/sprite_2.png
--- a/graphics/ornament/Flag05/sprite_3.png
+++ b/graphics/ornament/Flag05/sprite_3.png
--- a/graphics/ornament/Flag05/sprite_4.png
+++ b/graphics/ornament/Flag05/sprite_4.png
--- a/graphics/ornament/Flag05/sprite_5.png
+++ b/graphics/ornament/Flag05/sprite_5.png
--- a/graphics/ornament/Flag05/sprite_6.png
+++ b/graphics/ornament/Flag05/sprite_6.png
--- a/graphics/ornament/Flag06/sprite_1.png
+++ b/graphics/ornament/Flag06/sprite_1.png
--- a/graphics/ornament/Flag06/sprite_2.png
+++ b/graphics/ornament/Flag06/sprite_2.png
--- a/graphics/ornament/Flag06/sprite_3.png
+++ b/graphics/ornament/Flag06/sprite_3.png
--- a/graphics/ornament/Flag06/sprite_4.png
+++ b/graphics/ornament/Flag06/sprite_4.png
--- a/graphics/ornament/Flag06/sprite_5.png
+++ b/graphics/ornament/Flag06/sprite_5.png
--- a/graphics/ornament/Flag06/sprite_6.png
+++ b/graphics/ornament/Flag06/sprite_6.png
--- a/graphics/ornament/Flag07/sprite_1.png
+++ b/graphics/ornament/Flag07/sprite_1.png
--- a/graphics/ornament/Flag07/sprite_2.png
+++ b/graphics/ornament/Flag07/sprite_2.png
--- a/graphics/ornament/Flag07/sprite_3.png
+++ b/graphics/ornament/Flag07/sprite_3.png
--- a/graphics/ornament/Flag07/sprite_4.png
+++ b/graphics/ornament/Flag07/sprite_4.png
--- a/graphics/ornament/Flag07/sprite_5.png
+++ b/graphics/ornament/Flag07/sprite_5.png
--- a/graphics/ornament/Flag07/sprite_6.png
+++ b/graphics/ornament/Flag07/sprite_6.png
--- a/graphics/ornament/Flag08/sprite_1.png
+++ b/graphics/ornament/Flag08/sprite_1.png
--- a/graphics/ornament/Flag08/sprite_2.png
+++ b/graphics/ornament/Flag08/sprite_2.png
--- a/graphics/ornament/Flag08/sprite_3.png
+++ b/graphics/ornament/Flag08/sprite_3.png
--- a/graphics/ornament/Flag08/sprite_4.png
+++ b/graphics/ornament/Flag08/sprite_4.png
--- a/graphics/ornament/Flag08/sprite_5.png
+++ b/graphics/ornament/Flag08/sprite_5.png
--- a/graphics/ornament/Flag08/sprite_6.png
+++ b/graphics/ornament/Flag08/sprite_6.png
--- a/graphics/ornament/Flag09/sprite_1.png
+++ b/graphics/ornament/Flag09/sprite_1.png
--- a/graphics/ornament/Flag09/sprite_2.png
+++ b/graphics/ornament/Flag09/sprite_2.png
--- a/graphics/ornament/Flag09/sprite_3.png
+++ b/graphics/ornament/Flag09/sprite_3.png
--- a/graphics/ornament/Flag09/sprite_4.png
+++ b/graphics/ornament/Flag09/sprite_4.png
--- a/graphics/ornament/Flag09/sprite_5.png
+++ b/graphics/ornament/Flag09/sprite_5.png
--- a/graphics/ornament/Flag09/sprite_6.png
+++ b/graphics/ornament/Flag09/sprite_6.png
--- a/graphics/ornament/Flag10/sprite_1.png
+++ b/graphics/ornament/Flag10/sprite_1.png
--- a/graphics/ornament/Flag10/sprite_2.png
+++ b/graphics/ornament/Flag10/sprite_2.png
--- a/graphics/ornament/Flag10/sprite_3.png
+++ b/graphics/ornament/Flag10/sprite_3.png
--- a/graphics/ornament/Flag10/sprite_4.png
+++ b/graphics/ornament/Flag10/sprite_4.png
--- a/graphics/ornament/Flag10/sprite_5.png
+++ b/graphics/ornament/Flag10/sprite_5.png
--- a/graphics/ornament/Flag10/sprite_6.png
+++ b/graphics/ornament/Flag10/sprite_6.png
--- a/graphics/ornament/Flag100/sprite_1.png
+++ b/graphics/ornament/Flag100/sprite_1.png
--- a/graphics/ornament/Flag100/sprite_2.png
+++ b/graphics/ornament/Flag100/sprite_2.png
--- a/graphics/ornament/Flag100/sprite_3.png
+++ b/graphics/ornament/Flag100/sprite_3.png
--- a/graphics/ornament/Flag100/sprite_4.png
+++ b/graphics/ornament/Flag100/sprite_4.png
--- a/graphics/ornament/Flag100/sprite_5.png
+++ b/graphics/ornament/Flag100/sprite_5.png
--- a/graphics/ornament/Flag100/sprite_6.png
+++ b/graphics/ornament/Flag100/sprite_6.png
--- a/graphics/ornament/Flag101/sprite_1.png
+++ b/graphics/ornament/Flag101/sprite_1.png
--- a/graphics/ornament/Flag101/sprite_2.png
+++ b/graphics/ornament/Flag101/sprite_2.png
--- a/graphics/ornament/Flag101/sprite_3.png
+++ b/graphics/ornament/Flag101/sprite_3.png
--- a/graphics/ornament/Flag101/sprite_4.png
+++ b/graphics/ornament/Flag101/sprite_4.png
--- a/graphics/ornament/Flag101/sprite_5.png
+++ b/graphics/ornament/Flag101/sprite_5.png
--- a/graphics/ornament/Flag101/sprite_6.png
+++ b/graphics/ornament/Flag101/sprite_6.png
--- a/graphics/ornament/Flag102/sprite_1.png
+++ b/graphics/ornament/Flag102/sprite_1.png
--- a/graphics/ornament/Flag102/sprite_2.png
+++ b/graphics/ornament/Flag102/sprite_2.png
--- a/graphics/ornament/Flag102/sprite_3.png
+++ b/graphics/ornament/Flag102/sprite_3.png
--- a/graphics/ornament/Flag102/sprite_4.png
+++ b/graphics/ornament/Flag102/sprite_4.png
--- a/graphics/ornament/Flag102/sprite_5.png
+++ b/graphics/ornament/Flag102/sprite_5.png
--- a/graphics/ornament/Flag102/sprite_6.png
+++ b/graphics/ornament/Flag102/sprite_6.png
--- a/Show More
+++ b/Show More