Преглед на файлове

Umstrukturierung der Scripts, Mugshot Emotionen hinzugefügt (Anzeige verbuggt), include files geupdatet.

dragonflysots преди 6 години
родител
ревизия
2a90357a6f
променени са 6 файла, в които са добавени 402 реда и са изтрити 58 реда
  1. 1
    1
      sots-private
  2. 2
    2
      src/include/config/core.h
  3. 4
    1
      src/include/pymap_constants.h
  4. 43
    23
      src/include/script/language.h
  5. 130
    10
      src/include/script/mugshot.h
  6. 222
    21
      src/interface/mugshot_table.s

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit dc61b0364bef3a18e237440ce1708763e817d033
1
+Subproject commit 8d1e7fe039b4dd27c89e93edd080621d663d1ff1

+ 2
- 2
src/include/config/core.h Целия файл

@@ -27,8 +27,8 @@
27 27
 #define WALK_SCRIPT_VAR         0x5009
28 28
 
29 29
 /*Variables for Change OW Sprite*/
30
-#define CHANGE_OW_FROM         0x500A
31
-#define CHANGE_OW_TO           0x500B
30
+#define OW_REPLACE_VAR         0x500A
31
+#define OW_REPLACE_TO_VAR      0x500B
32 32
 
33 33
 /*Variable for custom text*/
34 34
 #define TEXT_VAR                0x500C

+ 4
- 1
src/include/pymap_constants.h Целия файл

@@ -69,7 +69,10 @@
69 69
 .equ VALUE_RIVALE_SCHULE_INDOOR, 0x1
70 70
 .equ VALUE_RIVALE_SCHULE_OUTDOOR, 0x2
71 71
 .equ VALUE_ZUM_LABOR, 0x3
72
-.equ VALUE_LABOR_ERSTES_MAL_BETRETEN, 0x4
72
+.equ VALUE_ERSTES_MAL_LABOR, 0x4
73
+.equ VALUE_OHNE_POKE_LABOR, 0x5
74
+.equ VALUE_MIT_POKE_LABOR, 0x6
75
+.equ VALUE_RIVALKAMPF_HESPERIAPFAD, 0x7
73 76
 
74 77
 
75 78
 

+ 43
- 23
src/include/script/language.h Целия файл

@@ -23,6 +23,11 @@
23 23
 .equ B_GE, 0x4
24 24
 .equ B_NE, 0x5
25 25
 
26
+@@ Variable
27
+.equ VAR_LASTRESULT, 0x800d
28
+.equ VAR_PLAYERFACING, 0x800c
29
+.equ VAR_LASTTALKED, 0x800f
30
+
26 31
 @@Spritefacing
27 32
 .equ SPRITEFACE_DOWN, 0x1
28 33
 .equ SPRITEFACE_UP, 0x2
@@ -61,6 +66,18 @@
61 66
 .equ EFFECT_GREY, 0x1
62 67
 .equ EFFECT_SERPIA, 0x2
63 68
 
69
+@@ Emotion
70
+.equ EMOT_NORMAL, 0x1
71
+.equ EMOT_UEBERLEGT, 0x2
72
+.equ EMOT_ERSTAUNT, 0x3
73
+.equ EMOT_TRAURIG, 0x4
74
+.equ EMOT_SAUER, 0x5
75
+.equ EMOT_GRINST, 0x6
76
+.equ EMOT_ZWINKERT, 0x7
77
+.equ EMOT_SCHOCKIERT, 0x8
78
+.equ EMOT_BOESESLACHEN, 0x9
79
+.equ EMOT_GENERVT, 0xa
80
+
64 81
 @@@@@@@@@@@@@@@@@ Macro
65 82
 
66 83
 @@ Custom commands
@@ -74,7 +91,7 @@ special 0x114
74 91
 .endm
75 92
 
76 93
 .macro spritefacedelay spritefacedelay_id:req spritefacedelay_facing:req
77
-spriteface \spritefacedelay_id spritefacedelay_facing
94
+spriteface \spritefacedelay_id \spritefacedelay_facing
78 95
 pause 0x20
79 96
 .endm
80 97
 
@@ -227,30 +244,32 @@ setvar 0x5006 0x8
227 244
 special 0x68
228 245
 .endm
229 246
 
230
-.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req
231
-.if \mugmsg_facing==MUGFACE_LEFT
232
-    setvar MUGHSOT_1_TABLE \mugmsg_sprite | 0x8000
233
-    setvar MUGSHOT_1_X 0x16
234
-    setvar MUGSHOT_1_Y 0x60
247
+.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0
248
+setvar 0x8000 0x0
249
+.if \mugmsg_sprite==MUG_RIVALE
250
+    .if \mugmsg_facing==MUGFACE_LEFT
251
+        call scr_mugrival_left
252
+    .endif
253
+    .if \mugmsg_facing==MUGFACE_RIGHT
254
+        call scr_mugrival_right
255
+    .endif
235 256
 .endif
236
-.if \mugmsg_facing==MUGFACE_RIGHT
237
-    setvar MUGHSOT_1_TABLE \mugmsg_sprite
238
-    setvar MUGSHOT_1_X 0xD0
239
-    setvar MUGSHOT_1_Y 0x60
257
+.if \mugmsg_sprite!=MUG_RIVALE
258
+    .if \mugmsg_facing==MUGFACE_LEFT
259
+        setvar MUGHSOT_1_TABLE \mugmsg_sprite|0x8000
260
+        setvar MUGSHOT_1_X 0x16
261
+        setvar MUGSHOT_1_Y 0x60
262
+    .endif
263
+    .if \mugmsg_facing==MUGFACE_RIGHT
264
+        setvar MUGHSOT_1_TABLE \mugmsg_sprite
265
+        setvar MUGSHOT_1_X 0xD0
266
+        setvar MUGSHOT_1_Y 0x60
267
+    .endif
240 268
 .endif
269
+addvar MUGHSOT_1_TABLE \mugmsg_emot
241 270
 msgbox \mugmsg_textpointer \mugmsg_callstd
242 271
 setvar MUGHSOT_1_TABLE 0x0
243
-.endm
244
-
245
-.macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req
246
-.if \mugrival_facing==MUGFACE_LEFT
247
-    call scr_mugrival_left
248
-.endif
249
-.if \mugrival_facing==MUGFACE_RIGHT
250
-    call scr_mugrival_right
251
-.endif
252
-msgbox \mugrival_textpointer \mugrival_callstd
253
-setvar MUGHSOT_1_TABLE 0x0
272
+pause 0x20
254 273
 .endm
255 274
 
256 275
 .macro transparenzon
@@ -294,8 +313,9 @@ clearflag FLAG_SKIP_BATTLE_MUSIC
294 313
 .endm
295 314
 
296 315
 .macro changeowto changeowto_from:req changeowto_to:req
297
-setvar CHANGE_OW_FROM \changeowto_from
298
-setvar CHANGE_OW_TO \changeowto_to
316
+setvar OW_REPLACE_VAR \changeowto_from
317
+addvar OW_REPLACE_VAR 0x1
318
+setvar OW_REPLACE_TO_VAR \changeowto_to
299 319
 .endm
300 320
 
301 321
 

+ 130
- 10
src/include/script/mugshot.h Целия файл

@@ -1,15 +1,135 @@
1 1
 #ifndef MUG_IDS_H_
2 2
 #define MUG_IDS_H_
3 3
 
4
-#define MUG_NOAH 1
5
-#define MUG_EMMA 2
6
-#define MUG_LINDA 3
7
-#define MUG_IDAN 4
8
-#define MUG_ACHIM 5
9
-#define MUG_NORMAN 6
10
-#define MUG_JANA 7
11
-#define MUG_MARKUS 8
12
-#define MUG_ISABELLE 9
13
-#define MUG_DIANA 10
4
+/*--------------------------------------------------------------------------------------------------------------------------*/
5
+/* Noah - Mugsprites                                                                                                        */
6
+/*--------------------------------------------------------------------------------------------------------------------------*/
7
+#define MUG_NOAH                    0x1
8
+    #define MUG_NOAH_UEBERLEGT      0x2
9
+    #define MUG_NOAH_ERSTAUNT       0x3
10
+    #define MUG_NOAH_TRAURIG        0x4
11
+    #define MUG_NOAH_SAUER          0x5
12
+    #define MUG_NOAH_GRINST         0x6
13
+    #define MUG_NOAH_ZWINKERT       0x7
14
+    #define MUG_NOAH_SCHOCKIERT     0x8
15
+    #define MUG_NOAH_BOESESLACHEN   0x9
16
+    #define MUG_NOAH_GENERVT        0xa
17
+
18
+/*--------------------------------------------------------------------------------------------------------------------------*/
19
+/* Emma - Mugsprites                                                                                                        */
20
+/*--------------------------------------------------------------------------------------------------------------------------*/
21
+#define MUG_EMMA                    0xb
22
+    #define MUG_EMMA_UEBERLEGT      0xc
23
+    #define MUG_EMMA_ERSTAUNT       0xd
24
+    #define MUG_EMMA_TRAURIG        0xe
25
+    #define MUG_EMMA_SAUER          0xf
26
+    #define MUG_EMMA_GRINST         0x10
27
+    #define MUG_EMMA_ZWINKERT       0x11
28
+    #define MUG_EMMA_SCHOCKIERT     0x12
29
+    #define MUG_EMMA_BOESESLACHEN   0x13
30
+    #define MUG_EMMA_GENERVT        0x14
31
+
32
+/*--------------------------------------------------------------------------------------------------------------------------*/
33
+/* Linda - Mugsprites                                                                                                       */
34
+/*--------------------------------------------------------------------------------------------------------------------------*/
35
+#define MUG_LINDA                   0x15
36
+    #define MUG_LINDA_UEBERLEGT     0x16
37
+    #define MUG_LINDA_ERSTAUNT      0x17
38
+    #define MUG_LINDA_TRAURIG       0x18
39
+    #define MUG_LINDA_SAUER         0x19
40
+    #define MUG_LINDA_GRINST        0x1a
41
+    #define MUG_LINDA_ZWINKERT      0x1b
42
+    #define MUG_LINDA_SCHOCKIERT    0x1c
43
+    #define MUG_LINDA_BOESESLACHEN  0x1d
44
+    #define MUG_LINDA_GENERVT       0x1e
45
+
46
+/*--------------------------------------------------------------------------------------------------------------------------*/
47
+/* Idan - Mugsprites                                                                                                        */
48
+/*--------------------------------------------------------------------------------------------------------------------------*/
49
+#define MUG_IDAN                    0x1f
50
+    #define MUG_IDAN_UEBERLEGT      0x20
51
+    #define MUG_IDAN_ERSTAUNT       0x21
52
+    #define MUG_IDAN_TRAURIG        0x22
53
+    #define MUG_IDAN_SAUER          0x23
54
+    #define MUG_IDAN_GRINST         0x24
55
+    #define MUG_IDAN_ZWINKERT       0x25
56
+    #define MUG_IDAN_SCHOCKIERT     0x26
57
+    #define MUG_IDAN_BOESESLACHEN   0x27
58
+    #define MUG_IDAN_GENERVT        0x28
59
+
60
+/*--------------------------------------------------------------------------------------------------------------------------*/
61
+/* Achim - Mugsprites                                                                                                       */
62
+/*--------------------------------------------------------------------------------------------------------------------------*/
63
+#define MUG_ACHIM                   0x29
64
+    #define MUG_ACHIM_UEBERLEGT     0x2a
65
+    #define MUG_ACHIM_ERSTAUNT      0x2b
66
+    #define MUG_ACHIM_TRAURIG       0x2c
67
+    #define MUG_ACHIM_SAUER         0x2d
68
+    #define MUG_ACHIM_GRINST        0x2e
69
+    #define MUG_ACHIM_ZWINKERT      0x2f
70
+    #define MUG_ACHIM_SCHOCKIERT    0x30
71
+    #define MUG_ACHIM_BOESESLACHEN  0x31
72
+    #define MUG_ACHIM_GENERVT       0x32
73
+
74
+/*--------------------------------------------------------------------------------------------------------------------------*/
75
+/* Norman - Mugsprites                                                                                                      */
76
+/*--------------------------------------------------------------------------------------------------------------------------*/
77
+#define MUG_NORMAN                  0x33
78
+    #define MUG_NORMAN_UEBERLEGT    0x34
79
+    #define MUG_NORMAN_ERSTAUNT     0x35
80
+    #define MUG_NORMAN_TRAURIG      0x36
81
+    #define MUG_NORMAN_SAUER        0x37
82
+    #define MUG_NORMAN_GRINST       0x38
83
+    #define MUG_NORMAN_ZWINKERT     0x39
84
+    #define MUG_NORMAN_SCHOCKIERT   0x3a
85
+    #define MUG_NORMAN_BOESESLACHEN 0x3b
86
+    #define MUG_NORMAN_GENERVT      0x3c
87
+
88
+/*--------------------------------------------------------------------------------------------------------------------------*/
89
+/* Jana - Mugsprites                                                                                                        */
90
+/*--------------------------------------------------------------------------------------------------------------------------*/
91
+#define MUG_JANA                    0x3d
92
+    #define MUG_JANA_UEBERLEGT      0x3e
93
+    #define MUG_JANA_ERSTAUNT       0x3f
94
+    #define MUG_JANA_TRAURIG        0x40
95
+    #define MUG_JANA_SAUER          0x41
96
+    #define MUG_JANA_GRINST         0x42
97
+    #define MUG_JANA_ZWINKERT       0x43
98
+    #define MUG_JANA_SCHOCKIERT     0x44
99
+    #define MUG_JANA_BOESESLACHEN   0x45
100
+    #define MUG_JANA_GENERVT        0x46
101
+
102
+/*--------------------------------------------------------------------------------------------------------------------------*/
103
+/* Markus - Mugsprites                                                                                                      */
104
+/*--------------------------------------------------------------------------------------------------------------------------*/
105
+#define MUG_MARKUS                  0x47
106
+    #define MUG_MARKUS_UEBERLEGT    0x48
107
+    #define MUG_MARKUS_ERSTAUNT     0x49
108
+    #define MUG_MARKUS_TRAURIG      0x4a
109
+    #define MUG_MARKUS_SAUER        0x4b
110
+    #define MUG_MARKUS_GRINST       0x4c
111
+    #define MUG_MARKUS_ZWINKERT     0x4d
112
+    #define MUG_MARKUS_SCHOCKIERT   0x4e
113
+    #define MUG_MARKUS_BOESESLACHEN 0x4f
114
+    #define MUG_MARKUS_GENERVT      0x50
115
+
116
+/*--------------------------------------------------------------------------------------------------------------------------*/
117
+/* Nadine - Mugsprites                                                                                                      */
118
+/*--------------------------------------------------------------------------------------------------------------------------*/
119
+#define MUG_NADINE                  0x51
120
+    #define MUG_NADINE_UEBERLEGT    0x52
121
+    #define MUG_NADINE_ERSTAUNT     0x53
122
+    #define MUG_NADINE_TRAURIG      0x54
123
+    #define MUG_NADINE_SAUER        0x55
124
+    #define MUG_NADINE_GRINST       0x56
125
+    #define MUG_NADINE_ZWINKERT     0x57
126
+    #define MUG_NADINE_SCHOCKIERT   0x58
127
+    #define MUG_NADINE_BOESESLACHEN 0x59
128
+    #define MUG_NADINE_GENERVT      0x5a
129
+
130
+/*--------------------------------------------------------------------------------------------------------------------------*/
131
+/* Diana - Mugsprites                                                                                                       */
132
+/*--------------------------------------------------------------------------------------------------------------------------*/
133
+#define MUG_DIANA                    0x5b
14 134
 
15 135
 #endif /* MUG_IDS_H */

+ 222
- 21
src/interface/mugshot_table.s Целия файл

@@ -3,25 +3,226 @@
3 3
 .section .rodata
4 4
 .align 2
5 5
 .global mugshots
6
-
7 6
 mugshots:
8
-.word mug_001Tiles
9
-.word mug_001Pal
10
-.word mug_002Tiles
11
-.word mug_002Pal
12
-.word mug_003Tiles
13
-.word mug_003Pal
14
-.word mug_004Tiles
15
-.word mug_004Pal
16
-.word mug_005Tiles
17
-.word mug_005Pal
18
-.word mug_006Tiles
19
-.word mug_006Pal
20
-.word mug_007Tiles
21
-.word mug_007Pal
22
-.word mug_008Tiles
23
-.word mug_008Pal
24
-.word mug_009Tiles
25
-.word mug_009Pal
26
-.word mug_010Tiles
27
-.word mug_010Pal
7
+
8
+@@-----------------------------------------------------------------------------------------------------------
9
+@@ Noah - Mugsprites
10
+@@-----------------------------------------------------------------------------------------------------------
11
+    .word mug_01_01Tiles
12
+    .word mug_01_01Pal
13
+    .word mug_01_02Tiles
14
+    .word mug_01_02Pal
15
+    .word mug_01_03Tiles
16
+    .word mug_01_03Pal
17
+    .word mug_01_04Tiles
18
+    .word mug_01_04Pal
19
+    .word mug_01_05Tiles
20
+    .word mug_01_05Pal
21
+    .word mug_01_06Tiles
22
+    .word mug_01_06Pal
23
+    .word mug_01_07Tiles
24
+    .word mug_01_07Pal
25
+    .word mug_01_08Tiles
26
+    .word mug_01_08Pal
27
+    .word mug_01_09Tiles
28
+    .word mug_01_09Pal
29
+    .word mug_01_10Tiles
30
+    .word mug_01_10Pal
31
+
32
+@@-----------------------------------------------------------------------------------------------------------
33
+@@ Emma - Mugsprites
34
+@@-----------------------------------------------------------------------------------------------------------
35
+    .word mug_02_01Tiles
36
+    .word mug_02_01Pal
37
+    .word mug_02_02Tiles
38
+    .word mug_02_02Pal
39
+    .word mug_02_03Tiles
40
+    .word mug_02_03Pal
41
+    .word mug_02_04Tiles
42
+    .word mug_02_04Pal
43
+    .word mug_02_05Tiles
44
+    .word mug_02_05Pal
45
+    .word mug_02_06Tiles
46
+    .word mug_02_06Pal
47
+    .word mug_02_07Tiles
48
+    .word mug_02_07Pal
49
+    .word mug_02_08Tiles
50
+    .word mug_02_08Pal
51
+    .word mug_02_09Tiles
52
+    .word mug_02_09Pal
53
+    .word mug_02_10Tiles
54
+    .word mug_02_10Pal
55
+
56
+@@-----------------------------------------------------------------------------------------------------------
57
+@@ Linda - Mugsprites
58
+@@-----------------------------------------------------------------------------------------------------------
59
+    .word mug_03_01Tiles
60
+    .word mug_03_01Pal
61
+    .word mug_03_02Tiles
62
+    .word mug_03_02Pal
63
+    .word mug_03_03Tiles
64
+    .word mug_03_03Pal
65
+    .word mug_03_04Tiles
66
+    .word mug_03_04Pal
67
+    .word mug_03_05Tiles
68
+    .word mug_03_05Pal
69
+    .word mug_03_06Tiles
70
+    .word mug_03_06Pal
71
+    .word mug_03_07Tiles
72
+    .word mug_03_07Pal
73
+    .word mug_03_08Tiles
74
+    .word mug_03_08Pal
75
+    .word mug_03_09Tiles
76
+    .word mug_03_09Pal
77
+    .word mug_03_10Tiles
78
+    .word mug_03_10Pal
79
+
80
+@@-----------------------------------------------------------------------------------------------------------
81
+@@ Idan - Mugsprites
82
+@@-----------------------------------------------------------------------------------------------------------
83
+    .word mug_04_01Tiles
84
+    .word mug_04_01Pal
85
+    .word mug_04_02Tiles
86
+    .word mug_04_02Pal
87
+    .word mug_04_03Tiles
88
+    .word mug_04_03Pal
89
+    .word mug_04_04Tiles
90
+    .word mug_04_04Pal
91
+    .word mug_04_05Tiles
92
+    .word mug_04_05Pal
93
+    .word mug_04_06Tiles
94
+    .word mug_04_06Pal
95
+    .word mug_04_07Tiles
96
+    .word mug_04_07Pal
97
+    .word mug_04_08Tiles
98
+    .word mug_04_08Pal
99
+    .word mug_04_09Tiles
100
+    .word mug_04_09Pal
101
+    .word mug_04_10Tiles
102
+    .word mug_04_10Pal
103
+
104
+@@-----------------------------------------------------------------------------------------------------------
105
+@@ Achim - Mugsprites
106
+@@-----------------------------------------------------------------------------------------------------------
107
+    .word mug_05_01Tiles
108
+    .word mug_05_01Pal
109
+    .word mug_05_02Tiles
110
+    .word mug_05_02Pal
111
+    .word mug_05_03Tiles
112
+    .word mug_05_03Pal
113
+    .word mug_05_04Tiles
114
+    .word mug_05_04Pal
115
+    .word mug_05_05Tiles
116
+    .word mug_05_05Pal
117
+    .word mug_05_06Tiles
118
+    .word mug_05_06Pal
119
+    .word mug_05_07Tiles
120
+    .word mug_05_07Pal
121
+    .word mug_05_08Tiles
122
+    .word mug_05_08Pal
123
+    .word mug_05_09Tiles
124
+    .word mug_05_09Pal
125
+    .word mug_05_10Tiles
126
+    .word mug_05_10Pal
127
+
128
+@@-----------------------------------------------------------------------------------------------------------
129
+@@ Norman - Mugsprites
130
+@@-----------------------------------------------------------------------------------------------------------
131
+    .word mug_06_01Tiles
132
+    .word mug_06_01Pal
133
+    .word mug_06_02Tiles
134
+    .word mug_06_02Pal
135
+    .word mug_06_03Tiles
136
+    .word mug_06_03Pal
137
+    .word mug_06_04Tiles
138
+    .word mug_06_04Pal
139
+    .word mug_06_05Tiles
140
+    .word mug_06_05Pal
141
+    .word mug_06_06Tiles
142
+    .word mug_06_06Pal
143
+    .word mug_06_07Tiles
144
+    .word mug_06_07Pal
145
+    .word mug_06_08Tiles
146
+    .word mug_06_08Pal
147
+    .word mug_06_09Tiles
148
+    .word mug_06_09Pal
149
+    .word mug_06_10Tiles
150
+    .word mug_06_10Pal
151
+
152
+@@-----------------------------------------------------------------------------------------------------------
153
+@@ Jana - Mugsprites
154
+@@-----------------------------------------------------------------------------------------------------------
155
+    .word mug_07_01Tiles
156
+    .word mug_07_01Pal
157
+    .word mug_07_02Tiles
158
+    .word mug_07_02Pal
159
+    .word mug_07_03Tiles
160
+    .word mug_07_03Pal
161
+    .word mug_07_04Tiles
162
+    .word mug_07_04Pal
163
+    .word mug_07_05Tiles
164
+    .word mug_07_05Pal
165
+    .word mug_07_06Tiles
166
+    .word mug_07_06Pal
167
+    .word mug_07_07Tiles
168
+    .word mug_07_07Pal
169
+    .word mug_07_08Tiles
170
+    .word mug_07_08Pal
171
+    .word mug_07_09Tiles
172
+    .word mug_07_09Pal
173
+    .word mug_07_10Tiles
174
+    .word mug_07_10Pal
175
+
176
+@@-----------------------------------------------------------------------------------------------------------
177
+@@ Markus - Mugsprites
178
+@@-----------------------------------------------------------------------------------------------------------
179
+    .word mug_08_01Tiles
180
+    .word mug_08_01Pal
181
+    @.word mug_08_02Tiles
182
+    @.word mug_08_02Pal
183
+    @.word mug_08_03Tiles
184
+    @.word mug_08_03Pal
185
+    @.word mug_08_04Tiles
186
+    @.word mug_08_04Pal
187
+    @.word mug_08_05Tiles
188
+    @.word mug_08_05Pal
189
+    @.word mug_08_06Tiles
190
+    @.word mug_08_06Pal
191
+    @.word mug_08_07Tiles
192
+    @.word mug_08_07Pal
193
+    @.word mug_08_08Tiles
194
+    @.word mug_08_08Pal
195
+    @.word mug_08_09Tiles
196
+    @.word mug_08_09Pal
197
+    @.word mug_08_10Tiles
198
+    @.word mug_08_10Pal
199
+
200
+@@-----------------------------------------------------------------------------------------------------------
201
+@@ Nadine - Mugsprites
202
+@@-----------------------------------------------------------------------------------------------------------
203
+    .word mug_09_01Tiles
204
+    .word mug_09_01Pal
205
+    @.word mug_09_02Tiles
206
+    @.word mug_09_02Pal
207
+    @.word mug_09_03Tiles
208
+    @.word mug_09_03Pal
209
+    @.word mug_09_04Tiles
210
+    @.word mug_09_04Pal
211
+    @.word mug_09_05Tiles
212
+    @.word mug_09_05Pal
213
+    @.word mug_09_06Tiles
214
+    @.word mug_09_06Pal
215
+    @.word mug_09_07Tiles
216
+    @.word mug_09_07Pal
217
+    @.word mug_09_08Tiles
218
+    @.word mug_09_08Pal
219
+    @.word mug_09_09Tiles
220
+    @.word mug_09_09Pal
221
+    @.word mug_09_10Tiles
222
+    @.word mug_09_10Pal
223
+
224
+@@-----------------------------------------------------------------------------------------------------------
225
+@@ Diana - Mugsprites
226
+@@-----------------------------------------------------------------------------------------------------------
227
+    .word mug_10_01Tiles
228
+    .word mug_10_01Pal