Browse Source

uturn (move) and effect for volt tackle

SBird1337 8 years ago
parent
commit
97c3cf8c38

+ 2
- 2
data/moves/animation_table.S View File

@@ -372,8 +372,8 @@ m_animation_table:
372 372
 .word 0x081C6F34 @365
373 373
 .word 0x081C6F34 @366
374 374
 .word 0x081C6F34 @367
375
-.word 0x081C6F34 @368
376
-.word 0x081C6F34 @369
375
+.word as_metal_burst @368
376
+.word as_uturn @369
377 377
 .word 0x081C6F34 @370
378 378
 .word 0x081C6F34 @371
379 379
 .word 0x081C6F34 @372

+ 1
- 1
data/moves/effect_table.S View File

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

+ 3
- 3
data/moves/move_data.S View File

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

+ 1
- 1
data/pkmn_tables/pokemon_moveset_table.S View File

@@ -1218,7 +1218,7 @@ moveset_bisasam:
1218 1218
 .byte 0x1 
1219 1219
 .hword 0x2D 
1220 1220
 .byte 0x3 
1221
-.hword MOVE_FEINT 
1221
+.hword MOVE_UTURN 
1222 1222
 .byte 0x7 
1223 1223
 .hword 0x16 
1224 1224
 .byte 0x9 

+ 5
- 0
nbproject/configurations.xml View File

@@ -4685,6 +4685,9 @@
4685 4685
             <in>tailwind.c</in>
4686 4686
             <in>tailwind_scripts.S</in>
4687 4687
           </df>
4688
+          <df name="uturn">
4689
+            <in>u_turn_script.S</in>
4690
+          </df>
4688 4691
         </df>
4689 4692
         <df name="music">
4690 4693
           <in>main_mixer.S</in>
@@ -27401,6 +27404,8 @@
27401 27404
             tool="4"
27402 27405
             flavor2="0">
27403 27406
       </item>
27407
+      <item path="src/moves/uturn/u_turn_script.S" ex="false" tool="4" flavor2="0">
27408
+      </item>
27404 27409
       <item path="src/music/main_mixer.S" ex="false" tool="4" flavor2="0">
27405 27410
       </item>
27406 27411
       <item path="src/music/music_override.c" ex="false" tool="0" flavor2="0">

+ 5
- 0
nbproject/private/configurations.xml View File

@@ -4065,6 +4065,8 @@
4065 4065
             </df>
4066 4066
             <df name="tailwind">
4067 4067
             </df>
4068
+            <df name="uturn">
4069
+            </df>
4068 4070
           </df>
4069 4071
           <df name="music">
4070 4072
           </df>
@@ -5834,6 +5836,9 @@
5834 5836
             <in>tailwind.c</in>
5835 5837
             <in>tailwind_scripts.S</in>
5836 5838
           </df>
5839
+          <df name="uturn">
5840
+            <in>u_turn_script.S</in>
5841
+          </df>
5837 5842
         </df>
5838 5843
         <df name="music">
5839 5844
           <in>main_mixer.S</in>

+ 9
- 1
src/moves/metal_burst/metal_burst_script.S View File

@@ -26,4 +26,12 @@ try_mirror_coat:
26 26
     damagecalc2
27 27
     cmd69
28 28
     callasm metal_burst_dmg_reduction+1
29
-    goto 0x81D6934
29
+    goto 0x81D6934
30
+
31
+.align 2
32
+.global as_metal_burst
33
+as_metal_burst:
34
+.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
35
+.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
36
+.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
37
+.byte 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x05, 0x08

+ 49
- 0
src/moves/uturn/u_turn_script.S View File

@@ -0,0 +1,49 @@
1
+#include <battle_script.h>
2
+#include <moves.h>
3
+
4
+.align 2
5
+.thumb
6
+.text
7
+
8
+.global bs_uturn_btpass
9
+bs_uturn_btpass:
10
+    jumpifhalfword 0x0 0x02023D4A MOVE_BATON_PASS 0x81D7995
11
+    attackcanceler
12
+    accuracycheck 0x81D695E 0x0
13
+    attackstring
14
+    ppreduce
15
+    calculatedamage
16
+    attackanimation
17
+    waitanimation
18
+    missmessage
19
+    cmd5c 0
20
+    waitstate
21
+    graphicalhpupdate 0
22
+    datahpupdate 0
23
+    critmessage
24
+    waitmessage 0x40
25
+    resultmessage
26
+    waitmessage 0x40
27
+    seteffectwithchancetarget
28
+    faintpokemon 0x0 0x0 0x0
29
+    jumpifcannotswitch 0x81 0x81D694E
30
+    goto 0x81D79A0
31
+
32
+.global as_uturn
33
+as_uturn:
34
+.byte 0x00, 0x05, 0x28, 0x00, 0x3B, 0x27, 0x0A, 0x01, 0x0C, 0x0C, 0x08, 0x19, 0x91, 0x00, 0xC0, 0x02
35
+.word as_uturn_particle_one
36
+.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
37
+.byte 0x02, 0x02, 0x06, 0x00, 0x04, 0x00, 0x04, 0x04, 0x19, 0xBA, 0x00, 0x3F, 0x02
38
+.word as_uturn_particle_two
39
+.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
40
+.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
41
+.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
42
+
43
+.align 2
44
+as_uturn_particle_one:
45
+.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
46
+
47
+.align 2
48
+as_uturn_particle_two:
49
+.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