SBird1337 7 gadus atpakaļ
vecāks
revīzija
b9b102c34f
3 mainītis faili ar 50 papildinājumiem un 50 dzēšanām
  1. 1
    1
      sots-private
  2. 47
    47
      src/include/mugssprites.h
  3. 2
    2
      src/interface/mugshot_table.s

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 71c2436a1f5ed193506491e9a70aea2fa696461f
1
+Subproject commit 0af8c77a31b4f249c7e6107768ea0a595bf85e5a

+ 47
- 47
src/include/mugssprites.h Parādīt failu

@@ -1,53 +1,53 @@
1 1
 #ifndef MUG_IDS_H_
2 2
 #define  MUG_IDS_H_
3 3
 
4
-#define MUG_NOAH, 1
5
-#define MUG_EMMA, 9
6
-#define MUG_LINDA, 17
7
-#define MUG_IDAN, 20
8
-#define MUG_ACHIM, 24
9
-#define MUG_NORMAN, 27
10
-#define MUG_JANA, 30
11
-#define MUG_MARKUS, 33
12
-#define MUG_ISABELLE, 35
13
-#define MUG_DIANA, 37
4
+#define MUG_NOAH 1
5
+#define MUG_EMMA 9
6
+#define MUG_LINDA 17
7
+#define MUG_IDAN 20
8
+#define MUG_ACHIM 24
9
+#define MUG_NORMAN 27
10
+#define MUG_JANA 30
11
+#define MUG_MARKUS 33
12
+#define MUG_ISABELLE 35
13
+#define MUG_DIANA 37
14 14
 
15
-#define MUG_NOAH_NORMAL, 1
16
-#define MUG_NOAH_LACHEN, 2
17
-#define MUG_NOAH_BESCHEIDEN, 3
18
-#define MUG_NOAH_ERSTAUNT, 4
19
-#define MUG_NOAH_TRAURIG, 5
20
-#define MUG_NOAH_SAUER, 6
21
-#define MUG_NOAH_WUT, 7
22
-#define MUG_NOAH_GRINSEN, 8
23
-#define MUG_EMMA_NORMAL, 9
24
-#define MUG_EMMA_LACHEN, 10
25
-#define MUG_EMMA_BESCHEIDEN, 11
26
-#define MUG_EMMA_ERSTAUNT, 12
27
-#define MUG_EMMA_TRAURIG, 13
28
-#define MUG_EMMA_SAUER, 14
29
-#define MUG_EMMA_WUT, 15
30
-#define MUG_EMMA_GRINSEN, 16
31
-#define MUG_LINDA_NORMAL, 17
32
-#define MUG_LINDA_LACHEN, 18
33
-#define MUG_LINDA_BESCHEIDEN, 19
34
-#define MUG_IDAN_NORMAL, 20
35
-#define MUG_IDAN_ERSTAUNT, 21
36
-#define MUG_IDAN_STUTZIG, 22
37
-#define MUG_IDAN_TRAURIG, 23
38
-#define MUG_ACHIM_NORMAL, 24
39
-#define MUG_ACHIM_GRINSEN, 25
40
-#define MUG_ACHIM_TRAURIG, 26
41
-#define MUG_NORMAN_NORMAL, 27
42
-#define MUG_NORMAN_GRINSEN, 28
43
-#define MUG_NORMAN_LACHEN, 29
44
-#define MUG_JANA_NORMAL, 30
45
-#define MUG_JANA_GRINSEN, 31
46
-#define MUG_JANA_LACHEN, 32
47
-#define MUG_MARKUS_NORMAL, 33
48
-#define MUG_MARKUS_NACHDENKEN, 34
49
-#define MUG_ISABELLE_NORMAL, 35
50
-#define MUG_ISABELLE_NACHDENKEN, 36
51
-#define MUG_DIANA_NORMAL, 37
15
+#define MUG_NOAH_NORMAL 1
16
+#define MUG_NOAH_LACHEN 2
17
+#define MUG_NOAH_BESCHEIDEN 3
18
+#define MUG_NOAH_ERSTAUNT 4
19
+#define MUG_NOAH_TRAURIG 5
20
+#define MUG_NOAH_SAUER 6
21
+#define MUG_NOAH_WUT 7
22
+#define MUG_NOAH_GRINSEN 8
23
+#define MUG_EMMA_NORMAL 9
24
+#define MUG_EMMA_LACHEN 10
25
+#define MUG_EMMA_BESCHEIDEN 11
26
+#define MUG_EMMA_ERSTAUNT 12
27
+#define MUG_EMMA_TRAURIG 13
28
+#define MUG_EMMA_SAUER 14
29
+#define MUG_EMMA_WUT 15
30
+#define MUG_EMMA_GRINSEN 16
31
+#define MUG_LINDA_NORMAL 17
32
+#define MUG_LINDA_LACHEN 18
33
+#define MUG_LINDA_BESCHEIDEN 19
34
+#define MUG_IDAN_NORMAL 20
35
+#define MUG_IDAN_ERSTAUNT 21
36
+#define MUG_IDAN_STUTZIG 22
37
+#define MUG_IDAN_TRAURIG 23
38
+#define MUG_ACHIM_NORMAL 24
39
+#define MUG_ACHIM_GRINSEN 25
40
+#define MUG_ACHIM_TRAURIG 26
41
+#define MUG_NORMAN_NORMAL 27
42
+#define MUG_NORMAN_GRINSEN 28
43
+#define MUG_NORMAN_LACHEN 29
44
+#define MUG_JANA_NORMAL 30
45
+#define MUG_JANA_GRINSEN 31
46
+#define MUG_JANA_LACHEN 32
47
+#define MUG_MARKUS_NORMAL 33
48
+#define MUG_MARKUS_NACHDENKEN 34
49
+#define MUG_ISABELLE_NORMAL 35
50
+#define MUG_ISABELLE_NACHDENKEN 36
51
+#define MUG_DIANA_NORMAL 37
52 52
 
53 53
 #endif /* MUG_IDS_H */

+ 2
- 2
src/interface/mugshot_table.s Parādīt failu

@@ -66,8 +66,8 @@ mugshots:
66 66
 .word mug_04_02Pal
67 67
 .word mug_04_03Tiles
68 68
 .word mug_04_03Pal
69
-.word mug_04_04Tiles
70
-.word mug_04_04Pal
69
+@@.word mug_04_04Tiles those do not exist
70
+@@.word mug_04_04Pal
71 71
 
72 72
 @@----------------------------------------------------------------------------------------------------------
73 73
 @@ Achim