move trainers to more reasonable c file

.gitignore

 *.ogg
 *.a
 *.i
+*.ci
 nbproject/private/tools/
 .vscode/*
 todo/

data/trainer/trainer_pkmn_data.s

-#include <constants/trainer.h>
+/*#include <constants/trainer.h>
 
 .align 2
 .text
 .hword 50 
 .hword 6 
 .hword PKMN_BISASAM 
-.hword ITEM_SINELBEERE
+.hword ITEM_SINELBEERE*/

g3headers

-Subproject commit 3e36531d290bd97e7b1208526e54c8acdfe376d3
+Subproject commit 083c36df58968b714fdec0b76c6d7df0208d708f

makefile

 MAPTS	  := $(MAPROOT)/tileset
 MAP_PROJ	:= $(MAPROOT)/sots.json
 SCRIPTROOT := $(MAPROOT)/script
+PDATAROOT := sots-private/data
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
 B_ENGINE  := battle_engine/build/linked.o
 STRING		:= $(call rwildcard,string/$(LAN)/,*.txt)
 STRING_SRC	:= $(STRING:%.txt=%.s)
 SCRIPT_SRC	:= $(call rwildcard,$(SCRIPTROOT)/,*.s)
+PDATA_SRC   := $(call rwildcard,$(PDATAROOT)/,*.c)
 
 MAP_PROJ_S	:= $(MAP_PROJ:%.json=%.s)
 MAP_PROJ_O	:= $(MAP_PROJ:%.json=$(BLDPATH)/%.o)
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
 SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
-ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ) $(MAP_PROJ_O) $(MAP_FILES_O) $(TS_FILES_O) $(TS_GEN_O)
+PDATA_OBJ   := $(PDATA_SRC:%.c=$(BLDPATH)/%.o)
+ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ) $(MAP_PROJ_O) $(MAP_FILES_O) $(TS_FILES_O) $(TS_GEN_O) $(PDATA_OBJ)
 
 $(MAPMAPS)/%.s: $(MAPMAPS)/%.pmh
 	@printf "\e[1;33mGenerating map\e[0m $<\n"
 	@printf "\e[1;33mGenerating tileset\e[0m $<\n"
 	$(PYSETS) -o $@ $<
 
-$(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
-	@printf "\e[1;36mGenerating strings\e[0m $<\n"
-	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
+$(BLDPATH)/sots-private/data/%.o: $(PDATAROOT)/%.c
+	@printf "\e[1;31mCompiling\e[0m $<\n"
+	$(shell mkdir -p $(dir $@))
+	$(CC) $(CFLAGS) -E -x c $< -o $(PDATAROOT)/$*.i
+	$(PREPROC) $(PDATAROOT)/$*.i $(CHARMAP) > $(PDATAROOT)/$*.ci
+	$(CC) $(CFLAGS) -c -x c $(PDATAROOT)/$*.ci -o $@
+	@rm -f $(PDATAROOT)/$*.ci  $(PDATAROOT)/$*.i
+	
 
 $(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h
 	@printf "\e[1;31mCompiling\e[0m $<\n"

sots-private

-Subproject commit 5b270e614e3c0d2eda30f62bfe4818c579b3d55d
+Subproject commit d3593ad524f9044fe89eb686faa65eed2e24a379