update titlescreen palettes, fixes #2

hex2rgba.py

@@ -0,0 +1,14 @@
+import struct
+
+with open("pkmn_sots.dmp", "rb") as f:
+    output = ""
+    while True:
+        s = f.read(2)
+        if not s:
+            break
+        col = struct.unpack("<H", s)[0]
+        r = col & 0x1F
+        g = (col >> 5) & 0x1F
+        b = (col >> 10) & 0x1F
+        output = output + "rgb82rgb5(0x{:02x},0x{:02x},0x{:02x}), ".format(r*8,g*8,b*8)
+    print(output)

patches/graphics/title.asm

@@ -24,10 +24,10 @@
 .word title_tileset_logo_nameTiles
 
 .org 0x08078A94
-.word ts_pals
+.word titlescreen_palette
 
 .org 0x080796C0
-.word ts_pals
+.word titlescreen_palette
 
 .org 0x08078A9C
 .word title_tileset_logo_nameMap

sots-private

@@ -1 +1 @@
-Subproject commit 30a5ab2f03ce0b2e02babac2dbd9a243688c4057
+Subproject commit 8b48ca3e38d8d150a701fee9065d0e0d1e497337

src/game_engine/title_screen.c

@@ -0,0 +1,70 @@
+#include <pokeagb/pokeagb.h>
+
+const union Color titlescreen_palette[] = {
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x28,0x50,0x90), rgb82rgb5(0x30,0x68,0xb0), rgb82rgb5(0xc0,0x98,0x10),
+rgb82rgb5(0x58,0x78,0x98), rgb82rgb5(0x78,0x88,0x50), rgb82rgb5(0xf0,0xc0,0x08), rgb82rgb5(0x20,0x38,0x70),
+rgb82rgb5(0x30,0x58,0xa0), rgb82rgb5(0x30,0x60,0xa8), rgb82rgb5(0x48,0x68,0x98), rgb82rgb5(0x88,0x88,0x50),
+rgb82rgb5(0xd8,0xb0,0x08), rgb82rgb5(0xe8,0xb8,0x08), rgb82rgb5(0xf8,0xc8,0x00), rgb82rgb5(0x68,0x78,0x80),
+
+rgb82rgb5(0xb0,0xa0,0x40), rgb82rgb5(0x30,0x38,0x68), rgb82rgb5(0xe8,0xe8,0xf8), rgb82rgb5(0x00,0x00,0x00),
+rgb82rgb5(0x68,0xa8,0xd0), rgb82rgb5(0xf8,0xf8,0xf8), rgb82rgb5(0x48,0x90,0xb8), rgb82rgb5(0xe0,0xe8,0xf0),
+rgb82rgb5(0x38,0x80,0xa8), rgb82rgb5(0xb8,0xd0,0xe8), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00),
+rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00),
+
+rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0xf6,0xf6,0xf6), rgb82rgb5(0x73,0xaf,0xdc), rgb82rgb5(0x87,0xbf,0xf8),
+rgb82rgb5(0x5a,0x89,0xbd), rgb82rgb5(0x5f,0x50,0xa3), rgb82rgb5(0x43,0x30,0x50), rgb82rgb5(0x40,0x67,0x97), 
+rgb82rgb5(0xea,0xa7,0x2b), rgb82rgb5(0x39,0x39,0x35), rgb82rgb5(0x9a,0x38,0x4b), rgb82rgb5(0xff,0x73,0x4a),
+rgb82rgb5(0x3a,0x44,0x6b), rgb82rgb5(0xde,0x4a,0x52), rgb82rgb5(0x52,0x73,0xd5), rgb82rgb5(0xb4,0xdc,0xfc), 
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x78,0x78,0x70), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x48,0x48,0x40),
+rgb82rgb5(0xe8,0xe8,0xf8), rgb82rgb5(0x30,0x30,0x28), rgb82rgb5(0xa8,0xa8,0xa8), rgb82rgb5(0x20,0x20,0x18), 
+rgb82rgb5(0x18,0x18,0x10), rgb82rgb5(0x08,0x08,0x08), rgb82rgb5(0x38,0x38,0x30), rgb82rgb5(0x00,0x00,0x00), 
+rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), 
+
+rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0xff,0xFF,0xff), rgb82rgb5(0x73,0xaf,0xdc), rgb82rgb5(0x87,0xbf,0xf8),
+rgb82rgb5(0x5a,0x89,0xbd), rgb82rgb5(0x5f,0x50,0xa3), rgb82rgb5(0x43,0x30,0x50), rgb82rgb5(0x40,0x67,0x97),
+rgb82rgb5(0xea,0xa7,0x2b), rgb82rgb5(0x39,0x39,0x35), rgb82rgb5(0x9a,0x38,0x4b), rgb82rgb5(0xff,0x73,0x4a),
+rgb82rgb5(0x3a,0x44,0x6b), rgb82rgb5(0xde,0x4a,0x52), rgb82rgb5(0x52,0x73,0xd5), rgb82rgb5(0xb4,0xdc,0xfc),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x00,0x80,0x00),
+
+};
+

test.txt

@@ -0,0 +1 @@
+rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x28,0x50,0x90), rgb82rgb5(0x30,0x68,0xb0), rgb82rgb5(0xc0,0x98,0x10), rgb82rgb5(0x58,0x78,0x98), rgb82rgb5(0x78,0x88,0x50), rgb82rgb5(0xf0,0xc0,0x08), rgb82rgb5(0x20,0x38,0x70), rgb82rgb5(0x30,0x58,0xa0), rgb82rgb5(0x30,0x60,0xa8), rgb82rgb5(0x48,0x68,0x98), rgb82rgb5(0x88,0x88,0x50), rgb82rgb5(0xd8,0xb0,0x08), rgb82rgb5(0xe8,0xb8,0x08), rgb82rgb5(0xf8,0xc8,0x00), rgb82rgb5(0x68,0x78,0x80), rgb82rgb5(0xb0,0xa0,0x40), rgb82rgb5(0x30,0x38,0x68), rgb82rgb5(0xe8,0xe8,0xf8), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x68,0xa8,0xd0), rgb82rgb5(0xf8,0xf8,0xf8), rgb82rgb5(0x48,0x90,0xb8), rgb82rgb5(0xe0,0xe8,0xf0), rgb82rgb5(0x38,0x80,0xa8), rgb82rgb5(0xb8,0xd0,0xe8), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x40,0x60,0x90), rgb82rgb5(0x38,0x40,0x68), rgb82rgb5(0xb0,0xd8,0xf8), rgb82rgb5(0x80,0xb8,0xf8), rgb82rgb5(0x58,0x88,0xb8), rgb82rgb5(0x98,0x38,0x48), rgb82rgb5(0xf8,0xa8,0x90), rgb82rgb5(0x38,0x38,0x30), rgb82rgb5(0xf8,0x70,0x48), rgb82rgb5(0xd8,0x48,0x50), rgb82rgb5(0x70,0xa8,0xd8), rgb82rgb5(0x50,0x70,0xd0), rgb82rgb5(0x60,0x60,0x58), rgb82rgb5(0xf0,0xf0,0xf0), rgb82rgb5(0x48,0x50,0x80), rgb82rgb5(0x00,0x80,0x00), rgb82rgb5(0x78,0x78,0x70), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x48,0x48,0x40), rgb82rgb5(0xe8,0xe8,0xf8), rgb82rgb5(0x30,0x30,0x28), rgb82rgb5(0xa8,0xa8,0xa8), rgb82rgb5(0x20,0x20,0x18), rgb82rgb5(0x18,0x18,0x10), rgb82rgb5(0x08,0x08,0x08), rgb82rgb5(0x38,0x38,0x30), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x70,0xa8,0xd8), rgb82rgb5(0x80,0xb8,0xf8), rgb82rgb5(0x58,0x88,0xb8), rgb82rgb5(0x60,0x60,0x58), rgb82rgb5(0x30,0x30,0x28), rgb82rgb5(0x40,0x60,0x90), rgb82rgb5(0xe8,0xa0,0x28), rgb82rgb5(0x38,0x38,0x30), rgb82rgb5(0xb0,0xd8,0xf8), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00), rgb82rgb5(0x00,0x00,0x00),