Browse Source

Script Progress: Ruinder Wächter | Bug: Trainerdaten stimmen nicht ganz

dragonflysots 6 years ago
parent
commit
c784c3a7ca
4 changed files with 103 additions and 77 deletions
  1. 1
    1
      sots-private
  2. 64
    40
      src/include/script/language.h
  3. 2
    0
      src/include/script/trainerid.h
  4. 36
    36
      src/interface/mugshot_table.s

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit c7b6ee222bc766949b06f12d87c05baa0fab2d10
1
+Subproject commit 2cf0b1fcd8f3e6a8c9e14c116dfd3a8e2836dda0

+ 64
- 40
src/include/script/language.h View File

@@ -283,46 +283,70 @@ setvar 0x5006 0x8
283 283
 special 0x68
284 284
 .endm
285 285
 
286
-.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0
286
+.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0        mugmsg_sprite2=0 mugmsg_emot2=0
287 287
 setvar 0x8000 0x0
288
-.if \mugmsg_sprite==MUG_RIVALE
289
-    .if \mugmsg_facing==MUGFACE_LEFT
290
-        call scr_mugrival_left
291
-    .endif
292
-    .if \mugmsg_facing==MUGFACE_RIGHT
293
-        call scr_mugrival_right
294
-    .endif
295
-.endif
296
-.if \mugmsg_sprite==MUG_PLAYER
297
-    .if \mugmsg_facing==MUGFACE_LEFT
298
-        call scr_mugrival_player_left
299
-    .endif
300
-    .if \mugmsg_facing==MUGFACE_RIGHT
301
-        call scr_mugrival_player_right
302
-    .endif
303
-.endif
304
-.if \mugmsg_sprite!=MUG_RIVALE&&\mugmsg_sprite!=MUG_PLAYER
305
-    .if \mugmsg_facing==MUGFACE_LEFT
306
-        setvar MUGHSOT_1_TABLE \mugmsg_sprite|0x8000
307
-        setvar MUGSHOT_1_X 0x16
308
-        setvar MUGSHOT_1_Y 0x60
309
-    .endif
310
-    .if \mugmsg_facing==MUGFACE_RIGHT
311
-        setvar MUGHSOT_1_TABLE \mugmsg_sprite
312
-        setvar MUGSHOT_1_X 0xD0
313
-        setvar MUGSHOT_1_Y 0x60
314
-    .endif
315
-.endif
316
-addvar MUGHSOT_1_TABLE \mugmsg_emot
317
-.if \mugmsg_callstd==5
318
-    msgbox \mugmsg_textpointer \mugmsg_callstd
319
-    closeonkeypress
320
-.endif
321
-.if \mugmsg_callstd!=5
322
-    msgbox \mugmsg_textpointer \mugmsg_callstd
323
-.endif
324
-setvar MUGHSOT_1_TABLE 0x0
325
-pause 0x20
288
+ .if \mugmsg_sprite==MUG_RIVALE
289
+     .if \mugmsg_facing==MUGFACE_LEFT
290
+         call scr_mugrival_left
291
+     .endif
292
+     .if \mugmsg_facing==MUGFACE_RIGHT
293
+         call scr_mugrival_right
294
+     .endif
295
+ .endif
296
+ .if \mugmsg_sprite==MUG_PLAYER
297
+     .if \mugmsg_facing==MUGFACE_LEFT
298
+         call scr_mugrival_player_left
299
+     .endif
300
+     .if \mugmsg_facing==MUGFACE_RIGHT
301
+         call scr_mugrival_player_right
302
+     .endif
303
+ .endif
304
+ .if \mugmsg_sprite==MUG_RIVALE&&\mugmsg_sprite2==MUG_PLAYER||\mugmsg_sprite2==MUG_RIVALE&&\mugmsg_sprite==MUG_PLAYER
305
+     .if \mugmsg_facing==MUGFACE_LEFT
306
+         call scr_mugrival_left_both
307
+     .endif
308
+     .if \mugmsg_facing==MUGFACE_RIGHT
309
+         call scr_mugrival_right_both
310
+     .endif
311
+ .endif
312
+ .if \mugmsg_sprite!=MUG_RIVALE&&\mugmsg_sprite!=MUG_PLAYER
313
+     .if \mugmsg_facing==MUGFACE_LEFT
314
+         setvar MUGHSOT_1_TABLE \mugmsg_sprite|0x8000
315
+         setvar MUGSHOT_1_X 0x16
316
+         setvar MUGSHOT_1_Y 0x60
317
+         .if \mugmsg_sprite2!=0
318
+             setvar MUGHSOT_2_TABLE \mugmsg_sprite2
319
+             setvar MUGSHOT_2_X 0xD0
320
+             setvar MUGSHOT_2_Y 0x60
321
+         .endif
322
+     .endif
323
+     .if \mugmsg_facing==MUGFACE_RIGHT
324
+         setvar MUGHSOT_1_TABLE \mugmsg_sprite
325
+         setvar MUGSHOT_1_X 0xD0
326
+         setvar MUGSHOT_1_Y 0x60
327
+         .if \mugmsg_sprite2!=0
328
+             setvar MUGHSOT_2_TABLE \mugmsg_sprite2|0x8000
329
+             setvar MUGSHOT_2_X 0x16
330
+             setvar MUGSHOT_2_Y 0x60
331
+         .endif
332
+     .endif
333
+ .endif
334
+ addvar MUGHSOT_1_TABLE \mugmsg_emot
335
+ .if \mugmsg_sprite2!=0
336
+     addvar MUGHSOT_2_TABLE \mugmsg_emot2
337
+ .endif
338
+ .if \mugmsg_callstd==5
339
+     msgbox \mugmsg_textpointer \mugmsg_callstd
340
+     closeonkeypress
341
+ .endif
342
+ .if \mugmsg_callstd!=5
343
+     msgbox \mugmsg_textpointer \mugmsg_callstd
344
+ .endif
345
+ setvar MUGHSOT_1_TABLE 0x0
346
+ .if \mugmsg_sprite2!=0
347
+     setvar MUGHSOT_2_TABLE 0x0
348
+ .endif
349
+ pause 0x20
326 350
 .endm
327 351
 
328 352
 .macro transparenzon
@@ -545,7 +569,7 @@ setvar OW_REPLACE_TO_VAR \changeowto_to
545 569
 .byte 0x32
546 570
 .endm
547 571
 
548
-.macro playsong playsong_song:req playsong_value:req
572
+.macro playsong playsong_song:req playsong_value=0
549 573
 .byte 0x33
550 574
 .hword \playsong_song
551 575
 .byte \playsong_value

+ 2
- 0
src/include/script/trainerid.h View File

@@ -3,5 +3,7 @@
3 3
 
4 4
 #define TRAINER_RIVALE_M_KAMPF_1  0x1
5 5
 #define TRAINER_RIVALE_F_KAMPF_1  0x4
6
+#define TRAINER_TT_NADINE_KAMPF_1 0x7
7
+
6 8
 
7 9
 #endif /* TRAINERID_IDS_H */

+ 36
- 36
src/interface/mugshot_table.s View File

@@ -178,48 +178,48 @@ mugshots:
178 178
 @@-----------------------------------------------------------------------------------------------------------
179 179
     .word mug_08_01Tiles
180 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
181
+    .word mug_08_01Tiles
182
+    .word mug_08_01Pal
183
+    .word mug_08_01Tiles
184
+    .word mug_08_01Pal
185
+    .word mug_08_01Tiles
186
+    .word mug_08_01Pal
187
+    .word mug_08_01Tiles
188
+    .word mug_08_01Pal
189
+    .word mug_08_01Tiles
190
+    .word mug_08_01Pal
191
+    .word mug_08_01Tiles
192
+    .word mug_08_01Pal
193
+    .word mug_08_01Tiles
194
+    .word mug_08_01Pal
195
+    .word mug_08_01Tiles
196
+    .word mug_08_01Pal
197
+    .word mug_08_01Tiles
198
+    .word mug_08_01Pal
199 199
 
200 200
 @@-----------------------------------------------------------------------------------------------------------
201 201
 @@ Nadine - Mugsprites
202 202
 @@-----------------------------------------------------------------------------------------------------------
203 203
     .word mug_09_01Tiles
204 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
205
+    .word mug_09_01Tiles
206
+    .word mug_09_01Pal
207
+    .word mug_09_01Tiles
208
+    .word mug_09_01Pal
209
+    .word mug_09_01Tiles
210
+    .word mug_09_01Pal
211
+    .word mug_09_01Tiles
212
+    .word mug_09_01Pal
213
+    .word mug_09_01Tiles
214
+    .word mug_09_01Pal
215
+    .word mug_09_01Tiles
216
+    .word mug_09_01Pal
217
+    .word mug_09_01Tiles
218
+    .word mug_09_01Pal
219
+    .word mug_09_01Tiles
220
+    .word mug_09_01Pal
221
+    .word mug_09_01Tiles
222
+    .word mug_09_01Pal
223 223
 
224 224
 @@-----------------------------------------------------------------------------------------------------------
225 225
 @@ Diana - Mugsprites