some more refractoring

data/raw_defines.s

@@ -16,4 +16,4 @@ save_one:
 
 .global ts_pals
 ts_pals:
-    .incbin "sots-private/assets/misc/title/pal.bin"
+    .include "data/title_pal.s"

data/title_pal.s

@@ -0,0 +1,22 @@
+/* Generated by BIN2S - please don't edit directly */
+	.section .rodata
+	.balign 4
+	.global pal_sth_bin_size
+	.global pal_sth_bin
+pal_sth_bin:
+	.byte   0,  2, 69, 73,166, 89,120, 10,235, 77, 47, 42, 30,  7,228, 56
+	.byte 102, 81,134, 85,169, 77, 49, 42,219,  6,253,  6, 63,  3,237, 65
+	.byte 150, 34,230, 52,189,127,  0,  0,173,106,255,127, 73, 94,188,123
+	.byte   7, 86, 87,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+	.byte   0,  0,136, 73,  7, 53,118,127,240,126, 43, 94,243, 36,191, 74
+	.byte 231, 24,223, 37, 59, 41,174,110,202,105,140, 45,222,123, 73, 65
+	.byte   0,  2,239, 57,  0,  0, 41, 33,189,127,198, 20,181, 86,132, 12
+	.byte  99,  8, 33,  4,231, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+	.byte   0,  0,174,110,240,126, 43, 94,140, 45,198, 20,136, 73,157, 22
+	.byte 231, 24,118,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+
+	.global pal_sth_bin_end
+pal_sth_bin_end:
+
+	.align
+pal_sth_bin_size: .int 160

makefile

@@ -23,7 +23,7 @@ CHARMAP := charmap.txt
 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
 ASFLAGS   := -mthumb
-CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color $(DEFINES)
+CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -fdiagnostics-show-option -fdiagnostics-color=always -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -107,6 +107,7 @@ $(B_ENGINE):
 .PHONY: clean
 clean:
 	rm -f  $(OUTPATH)/__symbols.sym $(OUTPATH)/pkmn_sots.gba
+	rm -rf generated_image/*
 	rm -R -f object/*
 	$(MAKE) -C $(dir $(MUSIC_AR)) clean
 	$(MAKE) -C $(dir $(SMPL_AR)) clean

src/include/script_language.h

@@ -1,14 +1,6 @@
 #include <config.h>
 #include <applymovements.h>
 
-@@ string macros
-
-.macro stringlocal language string
-    .ifdef \language
-        .string \string
-    .endif
-.endm
-
 @@ Compare operands
 .equ B_LT, 0x0
 .equ B_EQ, 0x1