Scripts angepasst, Kampfscreene zugewiesen, LED Anzeige zugewiesen, Hoehle der Weachter fehlt nur noch

battle_engine

@@ -1 +1 @@
-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

sots-private

@@ -1 +1 @@
-Subproject commit 39830f690d3735aa5b7f00b72f015732e2bd3f32
+Subproject commit 167d6ba7217429473bd6499da7d0c927270f55e3

src/include/battlescreen.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_HOEHLE 0x13
+#define BATTLESCREEN_SANDHOEHLE 0x14
+#define BATTLESCREEN_EISHOEHLE 0x15
+#define BATTLESCREEN_KRISTALLHOEHLE 0x16
+#define BATTLESCREEN_FEUERHOEHLE 0x17
+#define BATTLESCREEN_WASSERHOEHLE 0x18
+
+#endif /* MUG_IDS_H */

src/include/battlescreens.h

@@ -1,30 +0,0 @@
-#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/script_language.h

@@ -4,6 +4,7 @@
 #include <config.h>
 #include <applymovements.h>
 #include <mugssprites.h>
+#include <battlescreen.h>
 
 @@ Costum Specials
 .equ SP_BATCHMAPTILE, 0x7