sbird fixt etwas blabla

makefile

@@ -105,18 +105,6 @@ $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
 	@echo -e "\e[93mGenerating strings $<\e[0m"
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
 
-$(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script_language.h src/include/hiddenflags.h
-	@echo -e "\e[32mCompiling $<\e[0m"
-	$(shell mkdir -p $(dir $@))
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BLDPATH)/%.o: %.s $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script_language.h src/include/hiddenflags.h
-	@echo -e "\e[32mAssembling $<\e[0m"
-	$(shell mkdir -p $(dir $@))
-	$(PREPROC) $< $(CHARMAP) > $*.i
-	$(CC) $(CFLAGS) -c -x assembler-with-cpp $*.i -o $@
-	@rm -f $*.i
-
 $(MAPTS)/%.s: $(MAPTS)/%.png
 	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
 	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!

sots-private

@@ -1 +1 @@
-Subproject commit 240a75202d08438866fc9dbe9b9810079e6f987f
+Subproject commit 39830f690d3735aa5b7f00b72f015732e2bd3f32

src/include/battlescreens.h

@@ -0,0 +1,30 @@
+#ifndef BATTLESCREEN_IDS_H_
+#define  BATTLESCREEN_IDS_H__IDS_H_
+
+#define BATTLESCREEN_GRASS , 0x0
+#define BATTLESCREEN_STRAND , 0x1
+#define BATTLESCREEN_UNTERWASSER , 0x2
+#define BATTLESCREEN_MEER , 0x3
+#define BATTLESCREEN_SEE , 0x4
+#define BATTLESCREEN_GEBIRGE, 0x5
+#define BATTLESCREEN_HOEHLE_1 , 0x6
+#define BATTLESCREEN_INNEN , 0x7
+#define BATTLESCREEN_DORF , 0x8
+#define BATTLESCREEN_WALD1 , 0x9
+#define BATTLESCREEN_STADT , 0xA
+#define BATTLESCREEN_SCHNEESTADT , 0xB
+#define BATTLESCREEN_SCHNEEDORF , 0xC
+#define BATTLESCREEN_SCHNEESEE , 0xD
+#define BATTLESCREEN_WUESTE , 0xE
+#define BATTLESCREEN_WUESTENSEE , 0xF
+#define BATTLESCREEN_BRUECKE , 0x10
+#define BATTLESCREEN_HIMMEL , 0x11
+#define BATTLESCREEN_WALD2 , 0x12
+#define BATTLESCREEN_WASSERHOEHLE , 0x13
+#define BATTLESCREEN_SANDHOEHLE , 0x14
+#define BATTLESCREEN_EISHOEHÖE , 0x15
+#define BATTLESCREEN_KRISTALLHOEHLE , 0x16
+#define BATTLESCREEN_FEUERHOEHLE , 0x17
+#define BATTLESCREEN_WASSERHOEHLE , 0x18
+
+#endif /* MUG_IDS_H */

src/include/hiddenflags.h

@@ -1,23 +0,0 @@
-#include <script_language.h>
-
-.macro sethiddenflags
-setflag 0x501
-setflag 0x507
-setflag 0x509
-setflag 0x50E
-setflag 0x511
-setflag 0x512
-setflag 0x513
-setflag 0x516
-setflag 0x51B
-setflag 0x51C
-setflag 0x51F
-setflag 0x52F
-setflag 0x531
-setflag 0x532
-setflag 0x535
-setflag 0x536
-setflag 0x537
-setflag 0x53B
-setflag 0x53C
-.endm

src/include/script_language.h

@@ -3,7 +3,6 @@
 
 #include <config.h>
 #include <applymovements.h>
-#include <hiddenflags.h>
 #include <mugssprites.h>
 
 @@ Costum Specials
@@ -30,6 +29,14 @@
 .equ FLAG_ORDEN_7, 0x826
 .equ FLAG_ORDEN_8, 0x827
 
+@@ LED NAMES
+.equ LED_CARUN_CITY, 0x1
+.equ LED_ROUTE_2, 0x2
+.equ LED_ROUTE_3, 0x3
+.equ LED_URBANIA_CITY, 0x4
+.equ LED_ROUTE_5, 0x5
+.equ LED_ROUTE_6, 0x6
+
 @@ Flag operands
 .equ B_T, 0x0
 .equ B_F, 0x1
@@ -65,6 +72,10 @@ setvar 0x5006 SP_BATCHMAPTILE
 special 0x68
 .endm
 
+.macro sethiddenflags
+call sethiddenflagsall
+.endm
+
 .macro seteffect seteffect_effect_id:req
 writebytetooffset \seteffect_effect_id 0x02036E28
 .endm