sots-private: Neue Scripts und so

battle_engine

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

data/overworld/overworld_frames.s

@@ -6107,28 +6107,28 @@ ow_frames_npcs_0167:
 .word ow_npcs_0167Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(1*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(3*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(4*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(5*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(6*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(7*0x200)
 .hword 0x200
 .hword 0x0
-.word 0
+.word ow_npcs_0167Tiles+(8*0x200)
 .hword 0x200
 .hword 0x0
 .word ow_npcs_0167Tiles+(9*0x200)

sots-private

@@ -1 +1 @@
-Subproject commit daff2cf8d4475e10ea6854dda409d29318fda1f3
+Subproject commit cc641bb4476904b1f87e6934369a51f341f44fea

src/include/script_language.h

@@ -177,6 +177,12 @@ special 0x3B
 playsong \costumtrainerbattlemusic_id 0x0
 .endm
 
+.macro colorflicker colorflicker_farbbyte:req
+setvar 0x8000 \colorflicker_farbbyte
+setvar 0x5006 0x8
+special 0x68
+.endm
+
 .macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req
 .if \mugmsg_facing==MUGFACE_LEFT
     setvar MUGHSOT_1_TABLE \mugmsg_sprite | 0x8000

string/de/trainers/trainer_data.txt

@@ -707,7 +707,7 @@ str_trainer_name_88=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0 
 @hword 0, 0
-@byte 3, 0, 0, 0 
+@byte 2, 0, 0, 0 
 @word pokemon_von_id_88
 
 @byte 0, 111, 111, 131 
@@ -715,7 +715,7 @@ str_trainer_name_89=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0 
 @hword 15, 0
-@byte 3, 0, 0, 0 
+@byte 2, 0, 0, 0 
 @word pokemon_von_id_89
 
 @byte 0, 111, 111, 131 
@@ -723,7 +723,7 @@ str_trainer_name_90=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0 
 @hword 383, 0
-@byte 4, 0, 0, 0 
+@byte 3, 0, 0, 0 
 @word pokemon_von_id_90
 
 @byte 0, 111, 239, 132 
@@ -731,7 +731,7 @@ str_trainer_name_91=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0 
 @hword 0, 0
-@byte 3, 0, 0, 0 
+@byte 2, 0, 0, 0 
 @word pokemon_von_id_91
 
 @byte 0, 111, 239, 132 
@@ -739,7 +739,7 @@ str_trainer_name_92=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0 
 @hword 15, 0
-@byte 3, 0, 0, 0 
+@byte 2, 0, 0, 0 
 @word pokemon_von_id_92
 
 @byte 0, 111, 239, 132 
@@ -747,5 +747,5 @@ str_trainer_name_93=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0 
 @hword 383, 0
-@byte 4, 0, 0, 0 
+@byte 3, 0, 0, 0 
 @word pokemon_von_id_93