Просмотр исходного кода

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

DragonflySotS 7 лет назад
Родитель
Сommit
9f8c045f95
5 измененных файлов: 33 добавлений и 32 удалений
  1. 1
    1
      battle_engine
  2. 1
    1
      sots-private
  3. 30
    0
      src/include/battlescreen.h
  4. 0
    30
      src/include/battlescreens.h
  5. 1
    0
      src/include/script_language.h

+ 1
- 1
battle_engine

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

+ 1
- 1
sots-private

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

+ 30
- 0
src/include/battlescreen.h Просмотреть файл

@@ -0,0 +1,30 @@
1
+#ifndef BATTLESCREEN_IDS_H_
2
+#define  BATTLESCREEN_IDS_H__IDS_H_
3
+
4
+#define BATTLESCREEN_GRASS 0x0
5
+#define BATTLESCREEN_STRAND 0x1
6
+#define BATTLESCREEN_UNTERWASSER 0x2
7
+#define BATTLESCREEN_MEER 0x3
8
+#define BATTLESCREEN_SEE 0x4
9
+#define BATTLESCREEN_GEBIRGE 0x5
10
+#define BATTLESCREEN_HOEHLE_1 0x6
11
+#define BATTLESCREEN_INNEN 0x7
12
+#define BATTLESCREEN_DORF 0x8
13
+#define BATTLESCREEN_WALD1 0x9
14
+#define BATTLESCREEN_STADT 0xA
15
+#define BATTLESCREEN_SCHNEESTADT 0xB
16
+#define BATTLESCREEN_SCHNEEDORF 0xC
17
+#define BATTLESCREEN_SCHNEESEE 0xD
18
+#define BATTLESCREEN_WUESTE 0xE
19
+#define BATTLESCREEN_WUESTENSEE 0xF
20
+#define BATTLESCREEN_BRUECKE 0x10
21
+#define BATTLESCREEN_HIMMEL 0x11
22
+#define BATTLESCREEN_WALD2 0x12
23
+#define BATTLESCREEN_HOEHLE 0x13
24
+#define BATTLESCREEN_SANDHOEHLE 0x14
25
+#define BATTLESCREEN_EISHOEHLE 0x15
26
+#define BATTLESCREEN_KRISTALLHOEHLE 0x16
27
+#define BATTLESCREEN_FEUERHOEHLE 0x17
28
+#define BATTLESCREEN_WASSERHOEHLE 0x18
29
+
30
+#endif /* MUG_IDS_H */

+ 0
- 30
src/include/battlescreens.h Просмотреть файл

@@ -1,30 +0,0 @@
1
-#ifndef BATTLESCREEN_IDS_H_
2
-#define  BATTLESCREEN_IDS_H__IDS_H_
3
-
4
-#define BATTLESCREEN_GRASS , 0x0
5
-#define BATTLESCREEN_STRAND , 0x1
6
-#define BATTLESCREEN_UNTERWASSER , 0x2
7
-#define BATTLESCREEN_MEER , 0x3
8
-#define BATTLESCREEN_SEE , 0x4
9
-#define BATTLESCREEN_GEBIRGE, 0x5
10
-#define BATTLESCREEN_HOEHLE_1 , 0x6
11
-#define BATTLESCREEN_INNEN , 0x7
12
-#define BATTLESCREEN_DORF , 0x8
13
-#define BATTLESCREEN_WALD1 , 0x9
14
-#define BATTLESCREEN_STADT , 0xA
15
-#define BATTLESCREEN_SCHNEESTADT , 0xB
16
-#define BATTLESCREEN_SCHNEEDORF , 0xC
17
-#define BATTLESCREEN_SCHNEESEE , 0xD
18
-#define BATTLESCREEN_WUESTE , 0xE
19
-#define BATTLESCREEN_WUESTENSEE , 0xF
20
-#define BATTLESCREEN_BRUECKE , 0x10
21
-#define BATTLESCREEN_HIMMEL , 0x11
22
-#define BATTLESCREEN_WALD2 , 0x12
23
-#define BATTLESCREEN_WASSERHOEHLE , 0x13
24
-#define BATTLESCREEN_SANDHOEHLE , 0x14
25
-#define BATTLESCREEN_EISHOEHÖE , 0x15
26
-#define BATTLESCREEN_KRISTALLHOEHLE , 0x16
27
-#define BATTLESCREEN_FEUERHOEHLE , 0x17
28
-#define BATTLESCREEN_WASSERHOEHLE , 0x18
29
-
30
-#endif /* MUG_IDS_H */

+ 1
- 0
src/include/script_language.h Просмотреть файл

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