diff --git a/data/ornament_sbin.s b/data/ornament_sbin.s index 17c25773d..0da3236b0 100644 --- a/data/ornament_sbin.s +++ b/data/ornament_sbin.s @@ -4,7 +4,7 @@ .string "pksdir0\0" .global gUnknown_9E60560 gUnknown_9E60560: -.incbin "baserom.gba", 0x1E60560, 0x40 +.incbin "graphics/ornament/pal/flag00.pmdpal" .global gUnknown_9E605A0 gUnknown_9E605A0: .string "SIRO" @@ -116,7 +116,7 @@ gUnknown_9E60BB0: .incbin "baserom.gba", 0x1E60BC0, 0x4 .global gUnknown_9E60BC4 gUnknown_9E60BC4: -.incbin "baserom.gba", 0x1E60BC4, 0x40 +.incbin "graphics/ornament/pal/flag01.pmdpal" .global gUnknown_9E60C04 gUnknown_9E60C04: .string "SIRO" @@ -253,7 +253,7 @@ gUnknown_9E61644: .incbin "baserom.gba", 0x1E61654, 0x4 .global gUnknown_9E61658 gUnknown_9E61658: -.incbin "baserom.gba", 0x1E61658, 0x40 +.incbin "graphics/ornament/pal/flag02.pmdpal" .global gUnknown_9E61698 gUnknown_9E61698: .string "SIRO" @@ -360,7 +360,7 @@ gUnknown_9E62158: .incbin "baserom.gba", 0x1E62168, 0x4 .global gUnknown_9E6216C gUnknown_9E6216C: -.incbin "baserom.gba", 0x1E6216C, 0x40 +.incbin "graphics/ornament/pal/flag03.pmdpal" .global gUnknown_9E621AC gUnknown_9E621AC: .string "SIRO" @@ -497,7 +497,7 @@ gUnknown_9E62BAC: .incbin "baserom.gba", 0x1E62BBC, 0x4 .global gUnknown_9E62BC0 gUnknown_9E62BC0: -.incbin "baserom.gba", 0x1E62BC0, 0x40 +.incbin "graphics/ornament/pal/flag04.pmdpal" .global gUnknown_9E62C00 gUnknown_9E62C00: .string "SIRO" @@ -604,7 +604,7 @@ gUnknown_9E636C0: .incbin "baserom.gba", 0x1E636D0, 0x4 .global gUnknown_9E636D4 gUnknown_9E636D4: -.incbin "baserom.gba", 0x1E636D4, 0x40 +.incbin "graphics/ornament/pal/flag05.pmdpal" .global gUnknown_9E63714 gUnknown_9E63714: .string "SIRO" @@ -711,7 +711,7 @@ gUnknown_9E641D4: .incbin "baserom.gba", 0x1E641E4, 0x4 .global gUnknown_9E641E8 gUnknown_9E641E8: -.incbin "baserom.gba", 0x1E641E8, 0x40 +.incbin "graphics/ornament/pal/flag06.pmdpal" .global gUnknown_9E64228 gUnknown_9E64228: .string "SIRO" @@ -818,7 +818,7 @@ gUnknown_9E64CE8: .incbin "baserom.gba", 0x1E64CF8, 0x4 .global gUnknown_9E64CFC gUnknown_9E64CFC: -.incbin "baserom.gba", 0x1E64CFC, 0x40 +.incbin "graphics/ornament/pal/flag07.pmdpal" .global gUnknown_9E64D3C gUnknown_9E64D3C: .string "SIRO" @@ -926,7 +926,7 @@ gUnknown_9E657FC: .string "pksdir0\0" .global gUnknown_9E65818 gUnknown_9E65818: -.incbin "baserom.gba", 0x1E65818, 0x40 +.incbin "graphics/ornament/pal/flag08.pmdpal" .global gUnknown_9E65858 gUnknown_9E65858: .string "SIRO" @@ -1033,7 +1033,7 @@ gUnknown_9E66318: .incbin "baserom.gba", 0x1E66328, 0x4 .global gUnknown_9E6632C gUnknown_9E6632C: -.incbin "baserom.gba", 0x1E6632C, 0x40 +.incbin "graphics/ornament/pal/flag09.pmdpal" .global gUnknown_9E6636C gUnknown_9E6636C: .string "SIRO" @@ -1140,7 +1140,7 @@ gUnknown_9E66E2C: .incbin "baserom.gba", 0x1E66E3C, 0x4 .global gUnknown_9E66E40 gUnknown_9E66E40: -.incbin "baserom.gba", 0x1E66E40, 0x40 +.incbin "graphics/ornament/pal/flag100.pmdpal" .global gUnknown_9E66E80 gUnknown_9E66E80: .string "SIRO" @@ -1247,7 +1247,7 @@ gUnknown_9E67940: .incbin "baserom.gba", 0x1E67950, 0x4 .global gUnknown_9E67954 gUnknown_9E67954: -.incbin "baserom.gba", 0x1E67954, 0x40 +.incbin "graphics/ornament/pal/flag101.pmdpal" .global gUnknown_9E67994 gUnknown_9E67994: .string "SIRO" @@ -1354,7 +1354,7 @@ gUnknown_9E68454: .incbin "baserom.gba", 0x1E68464, 0x4 .global gUnknown_9E68468 gUnknown_9E68468: -.incbin "baserom.gba", 0x1E68468, 0x40 +.incbin "graphics/ornament/pal/flag102.pmdpal" .global gUnknown_9E684A8 gUnknown_9E684A8: .string "SIRO" @@ -1461,7 +1461,7 @@ gUnknown_9E68F68: .incbin "baserom.gba", 0x1E68F78, 0x4 .global gUnknown_9E68F7C gUnknown_9E68F7C: -.incbin "baserom.gba", 0x1E68F7C, 0x40 +.incbin "graphics/ornament/pal/flag103.pmdpal" .global gUnknown_9E68FBC gUnknown_9E68FBC: .string "SIRO" @@ -1568,7 +1568,7 @@ gUnknown_9E69A7C: .incbin "baserom.gba", 0x1E69A8C, 0x4 .global gUnknown_9E69A90 gUnknown_9E69A90: -.incbin "baserom.gba", 0x1E69A90, 0x40 +.incbin "graphics/ornament/pal/flag104.pmdpal" .global gUnknown_9E69AD0 gUnknown_9E69AD0: .string "SIRO" @@ -1675,7 +1675,7 @@ gUnknown_9E6A590: .incbin "baserom.gba", 0x1E6A5A0, 0x4 .global gUnknown_9E6A5A4 gUnknown_9E6A5A4: -.incbin "baserom.gba", 0x1E6A5A4, 0x40 +.incbin "graphics/ornament/pal/flag105.pmdpal" .global gUnknown_9E6A5E4 gUnknown_9E6A5E4: .string "SIRO" @@ -1782,7 +1782,7 @@ gUnknown_9E6B0A4: .incbin "baserom.gba", 0x1E6B0B4, 0xC .global gUnknown_9E6B0C0 gUnknown_9E6B0C0: -.incbin "baserom.gba", 0x1E6B0C0, 0x40 +.incbin "graphics/ornament/pal/flag106.pmdpal" .global gUnknown_9E6B100 gUnknown_9E6B100: .string "SIRO" @@ -1889,7 +1889,7 @@ gUnknown_9E6BBC0: .incbin "baserom.gba", 0x1E6BBD0, 0x4 .global gUnknown_9E6BBD4 gUnknown_9E6BBD4: -.incbin "baserom.gba", 0x1E6BBD4, 0x40 +.incbin "graphics/ornament/pal/flag107.pmdpal" .global gUnknown_9E6BC14 gUnknown_9E6BC14: .string "SIRO" @@ -1996,7 +1996,7 @@ gUnknown_9E6C6D4: .incbin "baserom.gba", 0x1E6C6E4, 0x4 .global gUnknown_9E6C6E8 gUnknown_9E6C6E8: -.incbin "baserom.gba", 0x1E6C6E8, 0x40 +.incbin "graphics/ornament/pal/flag108.pmdpal" .global gUnknown_9E6C728 gUnknown_9E6C728: .string "SIRO" @@ -2103,7 +2103,7 @@ gUnknown_9E6D1E8: .incbin "baserom.gba", 0x1E6D1F8, 0x4 .global gUnknown_9E6D1FC gUnknown_9E6D1FC: -.incbin "baserom.gba", 0x1E6D1FC, 0x40 +.incbin "graphics/ornament/pal/flag109.pmdpal" .global gUnknown_9E6D23C gUnknown_9E6D23C: .string "SIRO" @@ -2210,7 +2210,7 @@ gUnknown_9E6DCFC: .incbin "baserom.gba", 0x1E6DD0C, 0x4 .global gUnknown_9E6DD10 gUnknown_9E6DD10: -.incbin "baserom.gba", 0x1E6DD10, 0x40 +.incbin "graphics/ornament/pal/flag10.pmdpal" .global gUnknown_9E6DD50 gUnknown_9E6DD50: .string "SIRO" @@ -2317,7 +2317,7 @@ gUnknown_9E6E810: .incbin "baserom.gba", 0x1E6E820, 0x4 .global gUnknown_9E6E824 gUnknown_9E6E824: -.incbin "baserom.gba", 0x1E6E824, 0x40 +.incbin "graphics/ornament/pal/flag110.pmdpal" .global gUnknown_9E6E864 gUnknown_9E6E864: .string "SIRO" @@ -2424,7 +2424,7 @@ gUnknown_9E6F324: .incbin "baserom.gba", 0x1E6F334, 0x4 .global gUnknown_9E6F338 gUnknown_9E6F338: -.incbin "baserom.gba", 0x1E6F338, 0x40 +.incbin "graphics/ornament/pal/flag111.pmdpal" .global gUnknown_9E6F378 gUnknown_9E6F378: .string "SIRO" @@ -2531,7 +2531,7 @@ gUnknown_9E6FE38: .incbin "baserom.gba", 0x1E6FE48, 0x4 .global gUnknown_9E6FE4C gUnknown_9E6FE4C: -.incbin "baserom.gba", 0x1E6FE4C, 0x40 +.incbin "graphics/ornament/pal/flag112.pmdpal" .global gUnknown_9E6FE8C gUnknown_9E6FE8C: .string "SIRO" @@ -2639,7 +2639,7 @@ gUnknown_9E7094C: .string "pksdir0\0" .global gUnknown_9E70968 gUnknown_9E70968: -.incbin "baserom.gba", 0x1E70968, 0x40 +.incbin "graphics/ornament/pal/flag113.pmdpal" .global gUnknown_9E709A8 gUnknown_9E709A8: .string "SIRO" @@ -2746,7 +2746,7 @@ gUnknown_9E71468: .incbin "baserom.gba", 0x1E71478, 0x4 .global gUnknown_9E7147C gUnknown_9E7147C: -.incbin "baserom.gba", 0x1E7147C, 0x40 +.incbin "graphics/ornament/pal/flag114.pmdpal" .global gUnknown_9E714BC gUnknown_9E714BC: .string "SIRO" @@ -2853,7 +2853,7 @@ gUnknown_9E71F7C: .incbin "baserom.gba", 0x1E71F8C, 0x4 .global gUnknown_9E71F90 gUnknown_9E71F90: -.incbin "baserom.gba", 0x1E71F90, 0x40 +.incbin "graphics/ornament/pal/flag11.pmdpal" .global gUnknown_9E71FD0 gUnknown_9E71FD0: .string "SIRO" @@ -2960,7 +2960,7 @@ gUnknown_9E72A90: .incbin "baserom.gba", 0x1E72AA0, 0x4 .global gUnknown_9E72AA4 gUnknown_9E72AA4: -.incbin "baserom.gba", 0x1E72AA4, 0x40 +.incbin "graphics/ornament/pal/flag12.pmdpal" .global gUnknown_9E72AE4 gUnknown_9E72AE4: .string "SIRO" @@ -3067,7 +3067,7 @@ gUnknown_9E735A4: .incbin "baserom.gba", 0x1E735B4, 0x4 .global gUnknown_9E735B8 gUnknown_9E735B8: -.incbin "baserom.gba", 0x1E735B8, 0x40 +.incbin "graphics/ornament/pal/flag13.pmdpal" .global gUnknown_9E735F8 gUnknown_9E735F8: .string "SIRO" @@ -3174,7 +3174,7 @@ gUnknown_9E740B8: .incbin "baserom.gba", 0x1E740C8, 0x4 .global gUnknown_9E740CC gUnknown_9E740CC: -.incbin "baserom.gba", 0x1E740CC, 0x40 +.incbin "graphics/ornament/pal/flag14.pmdpal" .global gUnknown_9E7410C gUnknown_9E7410C: .string "SIRO" @@ -3301,7 +3301,7 @@ gUnknown_9E74B2C: .incbin "baserom.gba", 0x1E74B3C, 0x4 .global gUnknown_9E74B40 gUnknown_9E74B40: -.incbin "baserom.gba", 0x1E74B40, 0x40 +.incbin "graphics/ornament/pal/flag15.pmdpal" .global gUnknown_9E74B80 gUnknown_9E74B80: .string "SIRO" @@ -3408,7 +3408,7 @@ gUnknown_9E75640: .incbin "baserom.gba", 0x1E75650, 0x4 .global gUnknown_9E75654 gUnknown_9E75654: -.incbin "baserom.gba", 0x1E75654, 0x40 +.incbin "graphics/ornament/pal/flag16.pmdpal" .global gUnknown_9E75694 gUnknown_9E75694: .string "SIRO" @@ -4049,7 +4049,7 @@ gUnknown_9E77B1C: .incbin "baserom.gba", 0x1E77B2C, 0x4 .global gUnknown_9E77B30 gUnknown_9E77B30: -.incbin "baserom.gba", 0x1E77B30, 0x40 +.incbin "graphics/ornament/pal/stoneim.pmdpal" .global gUnknown_9E77B70 gUnknown_9E77B70: .string "SIRO" @@ -4345,7 +4345,7 @@ gUnknown_9E7B820: .incbin "baserom.gba", 0x1E7B830, 0x4 .global gUnknown_9E7B834 gUnknown_9E7B834: -.incbin "baserom.gba", 0x1E7B834, 0x40 +.incbin "graphics/ornament/pal/titlebg.pmdpal" .global gUnknown_9E7B874 gUnknown_9E7B874: .string "SIRO" @@ -5161,4 +5161,4 @@ gUnknown_9E7EAB4: .incbin "baserom.gba", 0x1E7EAC4, 0x4 .global gUnknown_9E7EAC8 gUnknown_9E7EAC8: -.incbin "baserom.gba", 0x1E7EAC8, 0x1538 +.incbin "graphics/ornament/pal/titleop.pmdpal" diff --git a/data/unk_9E7EB08.s b/data/unk_9E7EB08.s new file mode 100644 index 000000000..45f114e50 --- /dev/null +++ b/data/unk_9E7EB08.s @@ -0,0 +1,5 @@ +.section .rodata + +.align 2 + +.incbin "baserom.gba", 0x1E7EB08, 0x14F8 diff --git a/graphics/ornament/pal/flag00.pal b/graphics/ornament/pal/flag00.pal new file mode 100644 index 000000000..1b6edcc24 --- /dev/null +++ b/graphics/ornament/pal/flag00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +23 63 15 +55 111 47 +55 151 63 +119 135 71 +79 199 103 +247 127 39 +151 167 95 +87 239 87 +143 215 111 +175 215 119 +191 231 127 +191 247 127 +223 255 143 +255 255 199 +239 239 247 diff --git a/graphics/ornament/pal/flag01.pal b/graphics/ornament/pal/flag01.pal new file mode 100644 index 000000000..13108454e --- /dev/null +++ b/graphics/ornament/pal/flag01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +183 247 127 +135 111 71 +143 151 71 +127 175 111 +239 255 143 +151 127 39 +0 0 0 +0 0 0 +87 63 55 +119 95 55 +87 87 31 +127 135 55 +215 199 15 +255 255 47 +239 231 23 diff --git a/graphics/ornament/pal/flag02.pal b/graphics/ornament/pal/flag02.pal new file mode 100644 index 000000000..9a3551c06 --- /dev/null +++ b/graphics/ornament/pal/flag02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +55 63 39 +135 111 71 +143 151 71 +127 175 111 +239 255 143 +55 47 39 +223 191 55 +255 247 55 +79 79 39 +119 103 63 +55 63 39 +151 127 55 +223 215 119 +255 255 175 +239 231 151 diff --git a/graphics/ornament/pal/flag03.pal b/graphics/ornament/pal/flag03.pal new file mode 100644 index 000000000..d2c8830e3 --- /dev/null +++ b/graphics/ornament/pal/flag03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +183 247 127 +135 111 71 +143 151 71 +127 175 111 +239 255 143 +55 47 39 +0 0 0 +247 191 31 +223 167 23 +247 207 31 +79 87 63 +151 127 55 +231 223 127 +255 255 183 +247 239 135 diff --git a/graphics/ornament/pal/flag04.pal b/graphics/ornament/pal/flag04.pal new file mode 100644 index 000000000..c43b78726 --- /dev/null +++ b/graphics/ornament/pal/flag04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +183 247 127 +103 111 87 +143 151 71 +127 175 111 +239 255 143 +55 47 39 +199 103 71 +255 215 135 +223 215 119 +255 247 151 +79 87 63 +175 127 55 +239 127 103 +255 175 135 +247 151 111 diff --git a/graphics/ornament/pal/flag05.pal b/graphics/ornament/pal/flag05.pal new file mode 100644 index 000000000..a96101a1b --- /dev/null +++ b/graphics/ornament/pal/flag05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +111 63 0 +135 79 39 +175 95 39 +151 135 55 +151 175 119 +0 0 0 +0 0 0 +55 87 63 +55 143 95 +103 215 167 +167 255 199 +143 231 175 diff --git a/graphics/ornament/pal/flag06.pal b/graphics/ornament/pal/flag06.pal new file mode 100644 index 000000000..90f57b3f5 --- /dev/null +++ b/graphics/ornament/pal/flag06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +0 0 0 +167 135 79 +255 191 151 +199 159 119 +223 191 55 +255 247 55 +231 215 15 +0 0 0 +55 71 63 +23 119 119 +15 167 207 +15 215 255 +7 191 231 diff --git a/graphics/ornament/pal/flag07.pal b/graphics/ornament/pal/flag07.pal new file mode 100644 index 000000000..ab4eef829 --- /dev/null +++ b/graphics/ornament/pal/flag07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +87 63 119 +103 103 151 +135 135 183 +127 111 127 +151 175 159 +0 0 0 +231 231 231 +55 79 63 +79 135 87 +143 215 151 +199 255 199 +183 239 183 diff --git a/graphics/ornament/pal/flag08.pal b/graphics/ornament/pal/flag08.pal new file mode 100644 index 000000000..914c95e10 --- /dev/null +++ b/graphics/ornament/pal/flag08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +175 135 103 +159 119 87 +255 191 151 +199 159 119 +231 167 127 +215 191 95 +247 183 135 +0 0 0 +47 63 47 +119 135 23 +199 191 15 +247 247 23 +231 223 15 diff --git a/graphics/ornament/pal/flag09.pal b/graphics/ornament/pal/flag09.pal new file mode 100644 index 000000000..f76a538c9 --- /dev/null +++ b/graphics/ornament/pal/flag09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +95 87 31 +231 175 87 +255 199 31 +167 47 23 +239 63 39 +207 47 31 +231 231 231 +39 55 39 +127 103 0 +239 127 31 +255 183 55 +247 159 31 diff --git a/graphics/ornament/pal/flag10.pal b/graphics/ornament/pal/flag10.pal new file mode 100644 index 000000000..b8e7c0662 --- /dev/null +++ b/graphics/ornament/pal/flag10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +63 79 55 +95 87 31 +231 175 87 +255 239 31 +167 47 23 +223 63 39 +239 159 0 +231 231 231 +39 55 39 +127 103 0 +231 127 31 +255 183 55 +247 159 15 diff --git a/graphics/ornament/pal/flag100.pal b/graphics/ornament/pal/flag100.pal new file mode 100644 index 000000000..5af091025 --- /dev/null +++ b/graphics/ornament/pal/flag100.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +231 199 103 +175 159 71 +255 247 111 +0 0 0 +31 23 31 +55 23 87 +79 31 127 +127 71 159 +111 55 135 diff --git a/graphics/ornament/pal/flag101.pal b/graphics/ornament/pal/flag101.pal new file mode 100644 index 000000000..cbac9bdf6 --- /dev/null +++ b/graphics/ornament/pal/flag101.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +231 199 103 +175 159 71 +255 247 111 +0 0 0 +31 23 31 +103 71 135 +143 87 175 +191 119 231 +175 95 207 diff --git a/graphics/ornament/pal/flag102.pal b/graphics/ornament/pal/flag102.pal new file mode 100644 index 000000000..e859a2aff --- /dev/null +++ b/graphics/ornament/pal/flag102.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +31 79 143 +39 111 167 +0 0 0 +31 23 31 +39 111 167 +47 143 207 +79 183 231 +47 167 223 diff --git a/graphics/ornament/pal/flag103.pal b/graphics/ornament/pal/flag103.pal new file mode 100644 index 000000000..9f2592d22 --- /dev/null +++ b/graphics/ornament/pal/flag103.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +39 39 39 +95 159 127 +143 151 215 +247 255 255 +0 0 0 +31 23 31 +39 55 103 +47 63 167 +55 87 231 +55 79 207 diff --git a/graphics/ornament/pal/flag104.pal b/graphics/ornament/pal/flag104.pal new file mode 100644 index 000000000..c5beb7376 --- /dev/null +++ b/graphics/ornament/pal/flag104.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +183 87 87 +143 71 71 +0 0 0 +143 143 119 +39 39 39 +95 159 127 +143 151 215 +247 255 255 +0 0 0 +31 23 31 +151 119 103 +183 159 135 +223 207 175 +207 183 159 diff --git a/graphics/ornament/pal/flag105.pal b/graphics/ornament/pal/flag105.pal new file mode 100644 index 000000000..6cf6318c4 --- /dev/null +++ b/graphics/ornament/pal/flag105.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +167 167 167 +127 0 0 +95 159 127 +255 15 15 +247 255 255 +0 0 0 +31 23 31 +87 135 159 +119 167 191 +175 231 255 +151 207 247 diff --git a/graphics/ornament/pal/flag106.pal b/graphics/ornament/pal/flag106.pal new file mode 100644 index 000000000..a934051c8 --- /dev/null +++ b/graphics/ornament/pal/flag106.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +135 215 255 +167 167 167 +127 0 0 +95 159 127 +255 15 15 +247 255 255 +0 0 0 +31 23 31 +47 63 167 +47 71 199 +87 119 247 +55 87 231 diff --git a/graphics/ornament/pal/flag107.pal b/graphics/ornament/pal/flag107.pal new file mode 100644 index 000000000..88402542e --- /dev/null +++ b/graphics/ornament/pal/flag107.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +119 119 119 +39 39 39 +0 0 0 +31 23 31 +159 159 159 +215 215 207 +255 255 255 +239 239 231 diff --git a/graphics/ornament/pal/flag108.pal b/graphics/ornament/pal/flag108.pal new file mode 100644 index 000000000..b6cd2b6b6 --- /dev/null +++ b/graphics/ornament/pal/flag108.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +151 39 95 +207 47 119 +199 183 183 +247 55 151 +119 119 119 +39 39 39 +0 0 0 +31 23 31 +159 159 159 +215 215 207 +255 255 255 +239 239 231 diff --git a/graphics/ornament/pal/flag109.pal b/graphics/ornament/pal/flag109.pal new file mode 100644 index 000000000..a6394e001 --- /dev/null +++ b/graphics/ornament/pal/flag109.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +143 207 183 +119 0 15 +191 0 23 +79 111 55 +103 175 55 +55 159 55 +55 207 79 +0 0 0 +31 23 31 +159 159 159 +199 215 199 +255 255 255 +239 239 231 diff --git a/graphics/ornament/pal/flag11.pal b/graphics/ornament/pal/flag11.pal new file mode 100644 index 000000000..be18a04a6 --- /dev/null +++ b/graphics/ornament/pal/flag11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +0 0 0 +95 87 31 +111 31 31 +255 239 31 +159 47 23 +223 63 39 +239 159 0 +231 231 231 +39 55 39 +31 71 103 +47 111 119 +71 151 167 +55 127 151 diff --git a/graphics/ornament/pal/flag110.pal b/graphics/ornament/pal/flag110.pal new file mode 100644 index 000000000..aae70f026 --- /dev/null +++ b/graphics/ornament/pal/flag110.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +71 191 191 +135 215 207 +167 255 247 +135 135 135 +31 135 39 +199 199 199 +255 255 255 +199 183 0 +255 247 0 +31 23 31 +143 87 175 +191 119 231 +255 119 247 +239 111 231 diff --git a/graphics/ornament/pal/flag111.pal b/graphics/ornament/pal/flag111.pal new file mode 100644 index 000000000..cfc713f98 --- /dev/null +++ b/graphics/ornament/pal/flag111.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +127 79 31 +231 183 87 +239 119 95 +151 95 47 +79 63 39 +0 0 0 +31 23 31 +151 95 47 +231 183 87 +255 231 127 +255 207 111 diff --git a/graphics/ornament/pal/flag112.pal b/graphics/ornament/pal/flag112.pal new file mode 100644 index 000000000..d193f2506 --- /dev/null +++ b/graphics/ornament/pal/flag112.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 39 95 +71 0 0 +103 87 31 +159 127 15 +223 183 0 +255 231 39 +31 95 135 +39 119 183 +55 151 223 +31 23 31 +39 119 183 +95 167 199 +127 215 247 +111 191 215 diff --git a/graphics/ornament/pal/flag113.pal b/graphics/ornament/pal/flag113.pal new file mode 100644 index 000000000..bb5de062e --- /dev/null +++ b/graphics/ornament/pal/flag113.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +23 23 15 +79 63 39 +239 87 95 +255 239 175 +255 247 215 +199 63 79 +0 0 0 +31 23 31 +199 135 95 +255 207 111 +255 247 215 +255 239 175 diff --git a/graphics/ornament/pal/flag114.pal b/graphics/ornament/pal/flag114.pal new file mode 100644 index 000000000..a2c5df91b --- /dev/null +++ b/graphics/ornament/pal/flag114.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +0 0 0 +0 0 0 +23 23 15 +79 63 39 +239 87 95 +231 215 151 +255 247 215 +231 183 87 +151 95 47 +31 23 31 +199 135 95 +231 207 119 +255 239 175 +255 231 127 diff --git a/graphics/ornament/pal/flag12.pal b/graphics/ornament/pal/flag12.pal new file mode 100644 index 000000000..13f716486 --- /dev/null +++ b/graphics/ornament/pal/flag12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +0 0 0 +95 87 31 +87 87 87 +159 167 143 +191 199 167 +223 239 191 +239 159 0 +247 255 207 +55 63 47 +135 87 63 +183 87 15 +231 135 47 +215 111 7 diff --git a/graphics/ornament/pal/flag13.pal b/graphics/ornament/pal/flag13.pal new file mode 100644 index 000000000..3476a9783 --- /dev/null +++ b/graphics/ornament/pal/flag13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +191 119 39 +71 103 111 +127 143 151 +111 127 135 +223 239 191 +223 175 103 +103 63 23 +0 0 0 +55 47 31 +135 87 63 +183 87 15 +239 135 39 +215 111 15 diff --git a/graphics/ornament/pal/flag14.pal b/graphics/ornament/pal/flag14.pal new file mode 100644 index 000000000..c6567648a --- /dev/null +++ b/graphics/ornament/pal/flag14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +55 71 63 +79 119 159 +79 167 207 +103 223 255 +87 199 247 +71 151 39 +47 119 55 +79 175 95 +0 79 0 +23 95 23 +103 159 23 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/ornament/pal/flag15.pal b/graphics/ornament/pal/flag15.pal new file mode 100644 index 000000000..361e42922 --- /dev/null +++ b/graphics/ornament/pal/flag15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +0 0 0 +39 183 39 +87 111 15 +103 255 15 +55 127 47 +135 175 39 +223 175 103 +103 63 23 +39 47 31 +119 135 23 +183 199 15 +239 255 23 +207 223 15 diff --git a/graphics/ornament/pal/flag16.pal b/graphics/ornament/pal/flag16.pal new file mode 100644 index 000000000..5d8baa3ca --- /dev/null +++ b/graphics/ornament/pal/flag16.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +47 151 183 +0 0 0 +207 55 63 +0 0 0 +39 183 39 +87 111 15 +39 151 39 +55 127 47 +135 175 39 +0 79 0 +47 119 55 +39 47 31 +119 135 23 +183 191 15 +239 255 31 +223 223 15 diff --git a/graphics/ornament/pal/stoneim.pal b/graphics/ornament/pal/stoneim.pal new file mode 100644 index 000000000..64ea00c85 --- /dev/null +++ b/graphics/ornament/pal/stoneim.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 127 151 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +23 39 39 +63 71 71 +95 103 103 +127 135 135 +159 167 167 +191 199 199 +223 231 231 +255 255 255 diff --git a/graphics/ornament/pal/titlebg.pal b/graphics/ornament/pal/titlebg.pal new file mode 100644 index 000000000..8b413ebb4 --- /dev/null +++ b/graphics/ornament/pal/titlebg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +159 79 239 +0 0 0 +183 127 175 +207 135 159 +223 135 143 +239 135 127 +255 135 103 +255 143 23 +255 151 119 +255 159 47 +255 167 119 +255 167 143 +255 175 47 +255 191 79 +255 207 71 +247 151 143 diff --git a/graphics/ornament/pal/titleop.pal b/graphics/ornament/pal/titleop.pal new file mode 100644 index 000000000..748958473 --- /dev/null +++ b/graphics/ornament/pal/titleop.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +103 47 239 +0 0 0 +55 55 55 +127 95 63 +175 127 95 +0 0 0 +223 175 31 +239 215 31 +47 87 151 +47 119 183 +95 183 239 +255 79 0 +143 151 143 +207 215 207 +255 255 255 +119 0 183 diff --git a/ld_script.ld b/ld_script.ld index 91b1ae509..a0b526fe1 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -1037,6 +1037,12 @@ SECTIONS { src/ornament_files_table.o(.rodata); data/ornament_sbin.o(.rodata); } > ROM =0 + + unk_9E7EB08_section : + ALIGN(4) + { + data/unk_9E7EB08.o(.rodata); + } > ROM =0 sound_data : ALIGN(4) diff --git a/src/code_80035F0.c b/src/code_80035F0.c index 463c94ff7..7ed7b1a66 100644 --- a/src/code_80035F0.c +++ b/src/code_80035F0.c @@ -6,19 +6,14 @@ IWRAM_INIT bool8 gUnknown_3001B58 = FALSE; IWRAM_INIT u16 gUnknown_3001B5A = 0; -typedef struct unkStruct_3000C00_sub -{ - u8 unk0[4]; -} unkStruct_3000C00_sub; - typedef struct unkStruct_3000C00 { bool8 unk0; u8 unk1; s16 unk2; - unkStruct_3000C00_sub unk4; + RGB_Array unk4; s32 unk8; - void (*unkC)(u32, u32); + void (*unkC)(u16, u16); void (*unk10)(u32); } unkStruct_3000C00; @@ -28,13 +23,13 @@ typedef struct unkStruct_3000C00 IWRAM_DATA RGB_Union gUnknown_3000400[UNK_3000400_ARR_COUNT] = {0}; IWRAM_DATA unkStruct_3000C00 gUnknown_3000C00[UNK_3000C00_ARR_COUNT] = {0}; -void sub_8003A34(u32, u32); -void sub_8003AC0(u32, u32); -void sub_8003C18(u32, u32); -void sub_8003E2C(u32, u32); -void sub_8003F60(u32, u32); -void sub_8004170(u32, u32); -void sub_8004388(u32, u32); +void sub_8003A34(u16 param_1, u16 idx); +void sub_8003AC0(u16, u16); +void sub_8003C18(u16, u16); +void sub_8003E2C(u16, u16); +void sub_8003F60(u16, u16); +void sub_8004170(u16, u16); +void sub_8004388(u16, u16); void sub_8003B50(u32); void sub_8003D00(u32); void sub_8003EC0(u32); @@ -77,10 +72,10 @@ void sub_8003600(void) { it1->unk0 = FALSE; it1->unk2 = 0x100; - it1->unk4.unk0[0] = 0; - it1->unk4.unk0[1] = 0; - it1->unk4.unk0[2] = 0; - it1->unk4.unk0[3] = 0; + it1->unk4.c[0] = 0; + it1->unk4.c[1] = 0; + it1->unk4.c[2] = 0; + it1->unk4.c[3] = 0; it1->unk8 = 0; it1->unkC = &sub_8003A34; it1->unk10 = &sub_8003A74; @@ -89,19 +84,16 @@ void sub_8003600(void) *r6 = TRUE; } -void sub_8003664(s32 param_1, s16 param_2) +void sub_8003664(u16 idx, s32 param_2) { - u16 idx; - unkStruct_3000C00 *ptr; - idx = param_1; - ptr = &gUnknown_3000C00[idx]; + unkStruct_3000C00 *ptr = &gUnknown_3000C00[idx]; ptr->unk0 = TRUE; ptr->unk2 = param_2; - ptr->unk4.unk0[0] = 0; - ptr->unk4.unk0[1] = 0; - ptr->unk4.unk0[2] = 0; - ptr->unk4.unk0[3] = 0; + ptr->unk4.c[0] = 0; + ptr->unk4.c[1] = 0; + ptr->unk4.c[2] = 0; + ptr->unk4.c[3] = 0; ptr->unk8 = 0; ptr->unkC = &sub_8003AC0; ptr->unk10 = &sub_8003B50; @@ -109,12 +101,9 @@ void sub_8003664(s32 param_1, s16 param_2) gUnknown_3001B58 = TRUE; } -void sub_80036AC(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) +void sub_80036AC(u16 idx, s32 param_2, RGB_Array param_3) { - u16 idx; - unkStruct_3000C00 *ptr; - idx = param_1; - ptr = &gUnknown_3000C00[idx]; + unkStruct_3000C00 *ptr = &gUnknown_3000C00[idx]; ptr->unk0 = TRUE; ptr->unk2 = param_2; @@ -126,12 +115,9 @@ void sub_80036AC(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) gUnknown_3001B58 = TRUE; } -void sub_80036F4(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) +void sub_80036F4(u16 idx, s32 param_2, RGB_Array param_3) { - u16 idx; - unkStruct_3000C00 *ptr; - idx = param_1; - ptr = &gUnknown_3000C00[idx]; + unkStruct_3000C00 *ptr = &gUnknown_3000C00[idx]; ptr->unk0 = TRUE; ptr->unk2 = param_2; @@ -143,19 +129,16 @@ void sub_80036F4(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) gUnknown_3001B58 = TRUE; } -static UNUSED void sub_800373C(s32 param_1, s16 param_2, s32 param_3) +static UNUSED void sub_800373C(u16 idx, s32 param_2, s32 param_3) { - u16 idx; - unkStruct_3000C00 *ptr; - idx = param_1; - ptr = &gUnknown_3000C00[idx]; + unkStruct_3000C00 *ptr = &gUnknown_3000C00[idx]; ptr->unk0 = TRUE; ptr->unk2 = param_2; - ptr->unk4.unk0[0] = 0; - ptr->unk4.unk0[1] = 0; - ptr->unk4.unk0[2] = 0; - ptr->unk4.unk0[3] = 0; + ptr->unk4.c[0] = 0; + ptr->unk4.c[1] = 0; + ptr->unk4.c[2] = 0; + ptr->unk4.c[3] = 0; ptr->unk8 = param_3; ptr->unkC = &sub_8003F60; ptr->unk10 = &sub_8004034; @@ -163,12 +146,9 @@ static UNUSED void sub_800373C(s32 param_1, s16 param_2, s32 param_3) gUnknown_3001B58 = TRUE; } -void sub_8003780(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) +void sub_8003780(u16 idx, s32 param_2, RGB_Array param_3) { - u16 idx; - unkStruct_3000C00 *ptr; - idx = param_1; - ptr = &gUnknown_3000C00[idx]; + unkStruct_3000C00 *ptr = &gUnknown_3000C00[idx]; ptr->unk0 = TRUE; ptr->unk2 = param_2; @@ -180,12 +160,9 @@ void sub_8003780(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) gUnknown_3001B58 = TRUE; } -void sub_80037C8(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) +void sub_80037C8(u16 idx, s32 param_2, RGB_Array param_3) { - u16 idx; - unkStruct_3000C00 *ptr; - idx = param_1; - ptr = &gUnknown_3000C00[idx]; + unkStruct_3000C00 *ptr = &gUnknown_3000C00[idx]; ptr->unk0 = TRUE; ptr->unk2 = param_2; @@ -197,12 +174,9 @@ void sub_80037C8(s32 param_1, s16 param_2, unkStruct_3000C00_sub param_3) gUnknown_3001B58 = TRUE; } -void sub_8003810(u32 param_1, RGB_Union param_2) +void sub_8003810(u16 idx, RGB_Union param_2) { - u16 idx; - unkStruct_3000C00 *a; - idx = (u16) param_1; - a = &gUnknown_3000C00[idx / 16]; + unkStruct_3000C00 *a = &gUnknown_3000C00[idx / 16]; a->unk0 = TRUE; gUnknown_3000400[idx] = param_2; @@ -218,27 +192,13 @@ static UNUSED void sub_8003844(u16 idx1, u16 idx2) gUnknown_3001B58 = TRUE; } -void sub_800388C(u32 param_1, RGB_Union *param_2, s32 param_3) +void sub_800388C(u16 idx1, RGB_Union *param_2, s32 param_3) { - u16 idx1; - u16 idx2; - s32 sVar1; - u16 sVar2; - RGB_Union *ptr1; unkStruct_3000C00 *ptr3; s32 i; - - idx1 = param_1; - idx2 = idx1 / 16; - sVar1 = idx1 + param_3 - 1; - if (sVar1 < 0) - { - sVar1 += 0xf; - } - - sVar1 = (sVar1 << 0xc) >> 0x10; - sVar2 = sVar1; - ptr1 = &gUnknown_3000400[idx1]; + u16 idx2 = idx1 / 16; + u16 sVar2 = (idx1 + param_3 - 1) / 16; + RGB_Union *ptr1 = &gUnknown_3000400[idx1]; for (i = 0; i < param_3; param_2++, ptr1++, i++) { @@ -336,16 +296,14 @@ void sub_80039B8(void) } } -void sub_8003A34(u32 param_1, u32 param_2) +void sub_8003A34(u16 param_1, u16 idx) { - u16 idx; RGB_Union *ptr1; u32 blue; u32 green; u32 red; u16 color; - idx = param_2; ptr1 = &gUnknown_3000400[idx]; blue = (ptr1->asArr.c[2] & 0xf8) << 7; green = (ptr1->asArr.c[1] & 0xf8) << 2; diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c index d0d9681f5..b34ef0336 100644 --- a/tools/gbagfx/gfx.c +++ b/tools/gbagfx/gfx.c @@ -485,6 +485,31 @@ void ReadGbaPalette(char *path, struct Palette *palette) free(data); } +void ReadPmdPalette(char *path, struct Palette *palette) +{ + int fileSize; + unsigned char *data = ReadWholeFile(path, &fileSize); + + if (fileSize % 2 != 0) + FATAL_ERROR("The file size (%d) is not a multiple of 2.\n", fileSize); + + palette->numColors = fileSize / 4; + + for (int i = 0; i < palette->numColors; i++) { + palette->colors[i].red = data[i * 4 + 0]; + palette->colors[i].green = data[i * 4 + 1]; + palette->colors[i].blue = data[i * 4 + 2]; + } + // png can only accept 16 or 256 colors, so fill the remainder with black + if (palette->numColors > 16) + { + memset(&palette->colors[palette->numColors], 0, (256 - palette->numColors) * sizeof(struct Color)); + palette->numColors = 256; + } + + free(data); +} + void WriteGbaPalette(char *path, struct Palette *palette) { FILE *fp = fopen(path, "wb"); diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h index e881f6890..e301ec18a 100644 --- a/tools/gbagfx/gfx.h +++ b/tools/gbagfx/gfx.h @@ -48,6 +48,7 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); +void ReadPmdPalette(char *path, struct Palette *palette); void WriteGbaPalette(char *path, struct Palette *palette); void WritePmdPalette(char *path, struct Palette *palette); diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c index 117db99da..1bd9cb126 100644 --- a/tools/gbagfx/main.c +++ b/tools/gbagfx/main.c @@ -262,6 +262,14 @@ void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc U WriteJascPalette(outputPath, &palette); } +void HandlePmdPaletteToJascCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Palette palette = {}; + + ReadPmdPalette(inputPath, &palette); + WriteJascPalette(outputPath, &palette); +} + static void HandleJascToPaletteCommand(char *inputPath, char *outputPath, int argc, char **argv, bool isPmdPal) { int numColors = 0; @@ -570,6 +578,7 @@ int main(int argc, char **argv) { "gbapal", "pal", HandleGbaToJascPaletteCommand }, { "pal", "gbapal", HandleJascToGbaPaletteCommand }, { "pal", "pmdpal", HandleJascToPmdPaletteCommand }, + { "pmdpal", "pal", HandlePmdPaletteToJascCommand }, { "latfont", "png", HandleLatinFontToPngCommand }, { "png", "latfont", HandlePngToLatinFontCommand }, { "hwjpnfont", "png", HandleHalfwidthJapaneseFontToPngCommand },