uturn (move) and effect for volt tackle

data/moves/animation_table.S

@@ -372,8 +372,8 @@ m_animation_table:
 .word 0x081C6F34 @365
 .word 0x081C6F34 @366
 .word 0x081C6F34 @367
-.word 0x081C6F34 @368
-.word 0x081C6F34 @369
+.word as_metal_burst @368
+.word as_uturn @369
 .word 0x081C6F34 @370
 .word 0x081C6F34 @371
 .word 0x081C6F34 @372

data/moves/effect_table.S

@@ -133,7 +133,7 @@ m_effect_table:
 	.word 0x081D796E @124
 	.word 0x081D7977 @125
 	.word 0x081D7982 @126
-	.word 0x081D7995 @127
+	.word bs_uturn_btpass @127 (uturn, volt switch, baton pass)
 	.word 0x081D6900 @128
 	.word 0x081D79C2 @129
 	.word 0x081D79CD @130

data/moves/move_data.S

@@ -381,12 +381,12 @@ move_data_beerenkraefte:	.byte	MOVE_EFFECT_NONE,	1,		0,		100,		15,		0,		0,		0,
 move_data_offenlegung:		.byte	216,            	30,		0,		100,		10,		0,		0,		2,		0,		0,		0,		0
 @TODO PFLUECKER
 move_data_pfluecker:		.byte	MOVE_EFFECT_NONE,	60,		2,		100,		20,		0,		0,		0,		51,		0,		0,		0
-move_data_rueckenwind:		.byte	215,	0,		2,		0,		15,		0,		16,		0,		4,		0,		2,		0
+move_data_rueckenwind:		.byte	215,                    0,		2,		0,		15,		0,		16,		0,		4,		0,		2,		0
 @TODO AKUPRESSUR
 move_data_akupressur:		.byte	214,			0,		0,		0,		30,		0,		16,		0,		4,		0,		2,		0
-move_data_metallstoss:		.byte	89,	1,		8,		100,		10,		0,		1,		0,		0,		0,		0,		0
+move_data_metallstoss:		.byte	89,                     1,		8,		100,		10,		0,		1,		0,		0,		0,		0,		0
 @TODO KEHRTWENDE
-move_data_kehrtwende:		.byte	MOVE_EFFECT_NONE,	70,		6,		100,		20,		0,		0,		0,		51,		0,		0,		0
+move_data_kehrtwende:		.byte	127,            	70,		6,		100,		20,		0,		0,		0,		51,		0,		0,		0
 move_data_nahkampf:		.byte	MOVE_EFFECT_NONE,	120,		1,		100,		5,		100,		0,		0,		51,		0,		0,		0
 move_data_gegenstoss:		.byte	MOVE_EFFECT_NONE,	50,		17,		100,		10,		0,		0,		0,		51,		0,		0,		0
 move_data_gewissheit:		.byte	215,			60,		17,		100,		10,		0,		0,		0,		51,		0,		0,		0

data/pkmn_tables/pokemon_moveset_table.S

@@ -1218,7 +1218,7 @@ moveset_bisasam:
 .byte 0x1 
 .hword 0x2D 
 .byte 0x3 
-.hword MOVE_FEINT 
+.hword MOVE_UTURN 
 .byte 0x7 
 .hword 0x16 
 .byte 0x9 

nbproject/configurations.xml

@@ -4685,6 +4685,9 @@
             <in>tailwind.c</in>
             <in>tailwind_scripts.S</in>
           </df>
+          <df name="uturn">
+            <in>u_turn_script.S</in>
+          </df>
         </df>
         <df name="music">
           <in>main_mixer.S</in>
@@ -27401,6 +27404,8 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/uturn/u_turn_script.S" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="src/music/main_mixer.S" ex="false" tool="4" flavor2="0">
       </item>
       <item path="src/music/music_override.c" ex="false" tool="0" flavor2="0">

nbproject/private/configurations.xml

@@ -4065,6 +4065,8 @@
             </df>
             <df name="tailwind">
             </df>
+            <df name="uturn">
+            </df>
           </df>
           <df name="music">
           </df>
@@ -5834,6 +5836,9 @@
             <in>tailwind.c</in>
             <in>tailwind_scripts.S</in>
           </df>
+          <df name="uturn">
+            <in>u_turn_script.S</in>
+          </df>
         </df>
         <df name="music">
           <in>main_mixer.S</in>

src/moves/metal_burst/metal_burst_script.S

@@ -26,4 +26,12 @@ try_mirror_coat:
     damagecalc2
     cmd69
     callasm metal_burst_dmg_reduction+1
-    goto 0x81D6934
+    goto 0x81D6934
+
+.align 2
+.global as_metal_burst
+as_metal_burst:
+.byte 0x00, 0x14, 0x28, 0x0A, 0x03, 0x2A, 0x01, 0x03, 0x1D, 0x8B, 0x09, 0x08, 0x02, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08
+.byte 0x05, 0x0B, 0x03, 0x04, 0x00, 0x05, 0x00, 0xD6, 0x27, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0xF0, 0xFF, 0xF1, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0x10, 0x00, 0xFB
+.byte 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0xF4, 0xFF, 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00
+.byte 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x05, 0x08

src/moves/uturn/u_turn_script.S

@@ -0,0 +1,49 @@
+#include <battle_script.h>
+#include <moves.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_uturn_btpass
+bs_uturn_btpass:
+    jumpifhalfword 0x0 0x02023D4A MOVE_BATON_PASS 0x81D7995
+    attackcanceler
+    accuracycheck 0x81D695E 0x0
+    attackstring
+    ppreduce
+    calculatedamage
+    attackanimation
+    waitanimation
+    missmessage
+    cmd5c 0
+    waitstate
+    graphicalhpupdate 0
+    datahpupdate 0
+    critmessage
+    waitmessage 0x40
+    resultmessage
+    waitmessage 0x40
+    seteffectwithchancetarget
+    faintpokemon 0x0 0x0 0x0
+    jumpifcannotswitch 0x81 0x81D694E
+    goto 0x81D79A0
+
+.global as_uturn
+as_uturn:
+.byte 0x00, 0x05, 0x28, 0x00, 0x3B, 0x27, 0x0A, 0x01, 0x0C, 0x0C, 0x08, 0x19, 0x91, 0x00, 0xC0, 0x02
+.word as_uturn_particle_one
+.byte 0x02, 0x02, 0x0A, 0x00, 0xF6, 0xFF, 0x05, 0x03, 0xDD, 0x9B, 0x0B, 0x08, 0x02, 0x06, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x08, 0x00, 0x1F, 0x00, 0x05, 0x01, 0x05, 0x28, 0x00, 0x06, 0x28, 0x02, 0x54, 0x4E, 0x3D, 0x08
+.byte 0x02, 0x02, 0x06, 0x00, 0x04, 0x00, 0x04, 0x04, 0x19, 0xBA, 0x00, 0x3F, 0x02
+.word as_uturn_particle_two
+.byte 0x82, 0x02, 0x0A, 0x00, 0xF6, 0xFF, 0x05, 0x01, 0x06, 0x28, 0x00, 0x97, 0x27, 0x03, 0x1D, 0x8B, 0x09, 0x08, 0x02, 0x05, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x01, 0x00, 0x02, 0xB0, 0x7C, 0x3E, 0x08, 0x83, 0x05, 0xF6
+.byte 0xFF, 0xF8, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x08, 0x00, 0x19, 0x74, 0x00, 0x3F, 0x04, 0x08, 0x02, 0xB0, 0x7C, 0x3E, 0x08, 0x83, 0x05, 0x0A, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01, 0x00, 0x08, 0x00, 0x19, 0x86, 0x00, 0x3F, 0x05, 0x0B
+.byte 0x01, 0x0D, 0x00, 0xF2, 0x27, 0x19, 0xD9, 0x00, 0xC0, 0x03, 0xDD, 0x9B, 0x0B, 0x08, 0x02, 0x06, 0x1F, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0B, 0x00, 0xFF, 0xFF, 0x02, 0x50, 0xF1, 0x3F, 0x08, 0x02, 0x00, 0x08, 0xFF
+
+.align 2
+as_uturn_particle_one:
+.byte 0x05, 0x28, 0x3B, 0x27, 0xD8, 0xC9, 0x3A, 0x08, 0xF4, 0x68, 0x3E, 0x08, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x1C, 0x23, 0x08, 0x85, 0x14, 0x0B, 0x08
+
+.align 2
+as_uturn_particle_two:
+.byte 0x06, 0x28, 0x3B, 0x27, 0xE0, 0xC9, 0x3A, 0x08, 0x3C, 0x69, 0x3E, 0x08, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x1C, 0x23, 0x08, 0x85, 0x14, 0x0B, 0x08