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

sots-private

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

src/include/script/language.h

@@ -283,46 +283,70 @@ setvar 0x5006 0x8
 special 0x68
 .endm
 
-.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0
+.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0        mugmsg_sprite2=0 mugmsg_emot2=0
 setvar 0x8000 0x0
-.if \mugmsg_sprite==MUG_RIVALE
-    .if \mugmsg_facing==MUGFACE_LEFT
-        call scr_mugrival_left
-    .endif
-    .if \mugmsg_facing==MUGFACE_RIGHT
-        call scr_mugrival_right
-    .endif
-.endif
-.if \mugmsg_sprite==MUG_PLAYER
-    .if \mugmsg_facing==MUGFACE_LEFT
-        call scr_mugrival_player_left
-    .endif
-    .if \mugmsg_facing==MUGFACE_RIGHT
-        call scr_mugrival_player_right
-    .endif
-.endif
-.if \mugmsg_sprite!=MUG_RIVALE&&\mugmsg_sprite!=MUG_PLAYER
-    .if \mugmsg_facing==MUGFACE_LEFT
-        setvar MUGHSOT_1_TABLE \mugmsg_sprite|0x8000
-        setvar MUGSHOT_1_X 0x16
-        setvar MUGSHOT_1_Y 0x60
-    .endif
-    .if \mugmsg_facing==MUGFACE_RIGHT
-        setvar MUGHSOT_1_TABLE \mugmsg_sprite
-        setvar MUGSHOT_1_X 0xD0
-        setvar MUGSHOT_1_Y 0x60
-    .endif
-.endif
-addvar MUGHSOT_1_TABLE \mugmsg_emot
-.if \mugmsg_callstd==5
-    msgbox \mugmsg_textpointer \mugmsg_callstd
-    closeonkeypress
-.endif
-.if \mugmsg_callstd!=5
-    msgbox \mugmsg_textpointer \mugmsg_callstd
-.endif
-setvar MUGHSOT_1_TABLE 0x0
-pause 0x20
+ .if \mugmsg_sprite==MUG_RIVALE
+     .if \mugmsg_facing==MUGFACE_LEFT
+         call scr_mugrival_left
+     .endif
+     .if \mugmsg_facing==MUGFACE_RIGHT
+         call scr_mugrival_right
+     .endif
+ .endif
+ .if \mugmsg_sprite==MUG_PLAYER
+     .if \mugmsg_facing==MUGFACE_LEFT
+         call scr_mugrival_player_left
+     .endif
+     .if \mugmsg_facing==MUGFACE_RIGHT
+         call scr_mugrival_player_right
+     .endif
+ .endif
+ .if \mugmsg_sprite==MUG_RIVALE&&\mugmsg_sprite2==MUG_PLAYER||\mugmsg_sprite2==MUG_RIVALE&&\mugmsg_sprite==MUG_PLAYER
+     .if \mugmsg_facing==MUGFACE_LEFT
+         call scr_mugrival_left_both
+     .endif
+     .if \mugmsg_facing==MUGFACE_RIGHT
+         call scr_mugrival_right_both
+     .endif
+ .endif
+ .if \mugmsg_sprite!=MUG_RIVALE&&\mugmsg_sprite!=MUG_PLAYER
+     .if \mugmsg_facing==MUGFACE_LEFT
+         setvar MUGHSOT_1_TABLE \mugmsg_sprite|0x8000
+         setvar MUGSHOT_1_X 0x16
+         setvar MUGSHOT_1_Y 0x60
+         .if \mugmsg_sprite2!=0
+             setvar MUGHSOT_2_TABLE \mugmsg_sprite2
+             setvar MUGSHOT_2_X 0xD0
+             setvar MUGSHOT_2_Y 0x60
+         .endif
+     .endif
+     .if \mugmsg_facing==MUGFACE_RIGHT
+         setvar MUGHSOT_1_TABLE \mugmsg_sprite
+         setvar MUGSHOT_1_X 0xD0
+         setvar MUGSHOT_1_Y 0x60
+         .if \mugmsg_sprite2!=0
+             setvar MUGHSOT_2_TABLE \mugmsg_sprite2|0x8000
+             setvar MUGSHOT_2_X 0x16
+             setvar MUGSHOT_2_Y 0x60
+         .endif
+     .endif
+ .endif
+ addvar MUGHSOT_1_TABLE \mugmsg_emot
+ .if \mugmsg_sprite2!=0
+     addvar MUGHSOT_2_TABLE \mugmsg_emot2
+ .endif
+ .if \mugmsg_callstd==5
+     msgbox \mugmsg_textpointer \mugmsg_callstd
+     closeonkeypress
+ .endif
+ .if \mugmsg_callstd!=5
+     msgbox \mugmsg_textpointer \mugmsg_callstd
+ .endif
+ setvar MUGHSOT_1_TABLE 0x0
+ .if \mugmsg_sprite2!=0
+     setvar MUGHSOT_2_TABLE 0x0
+ .endif
+ pause 0x20
 .endm
 
 .macro transparenzon
@@ -545,7 +569,7 @@ setvar OW_REPLACE_TO_VAR \changeowto_to
 .byte 0x32
 .endm
 
-.macro playsong playsong_song:req playsong_value:req
+.macro playsong playsong_song:req playsong_value=0
 .byte 0x33
 .hword \playsong_song
 .byte \playsong_value

src/include/script/trainerid.h

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

src/interface/mugshot_table.s

@@ -178,48 +178,48 @@ mugshots:
 @@-----------------------------------------------------------------------------------------------------------
     .word mug_08_01Tiles
     .word mug_08_01Pal
-    @.word mug_08_02Tiles
-    @.word mug_08_02Pal
-    @.word mug_08_03Tiles
-    @.word mug_08_03Pal
-    @.word mug_08_04Tiles
-    @.word mug_08_04Pal
-    @.word mug_08_05Tiles
-    @.word mug_08_05Pal
-    @.word mug_08_06Tiles
-    @.word mug_08_06Pal
-    @.word mug_08_07Tiles
-    @.word mug_08_07Pal
-    @.word mug_08_08Tiles
-    @.word mug_08_08Pal
-    @.word mug_08_09Tiles
-    @.word mug_08_09Pal
-    @.word mug_08_10Tiles
-    @.word mug_08_10Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
+    .word mug_08_01Tiles
+    .word mug_08_01Pal
 
 @@-----------------------------------------------------------------------------------------------------------
 @@ Nadine - Mugsprites
 @@-----------------------------------------------------------------------------------------------------------
     .word mug_09_01Tiles
     .word mug_09_01Pal
-    @.word mug_09_02Tiles
-    @.word mug_09_02Pal
-    @.word mug_09_03Tiles
-    @.word mug_09_03Pal
-    @.word mug_09_04Tiles
-    @.word mug_09_04Pal
-    @.word mug_09_05Tiles
-    @.word mug_09_05Pal
-    @.word mug_09_06Tiles
-    @.word mug_09_06Pal
-    @.word mug_09_07Tiles
-    @.word mug_09_07Pal
-    @.word mug_09_08Tiles
-    @.word mug_09_08Pal
-    @.word mug_09_09Tiles
-    @.word mug_09_09Pal
-    @.word mug_09_10Tiles
-    @.word mug_09_10Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
+    .word mug_09_01Tiles
+    .word mug_09_01Pal
 
 @@-----------------------------------------------------------------------------------------------------------
 @@ Diana - Mugsprites