feint, tailwind, metal burst (new moves)

bpre.sym

@@ -101,6 +101,7 @@ battle_stuff_ptr = 0x02023FE8;
 battle_enigma_berry = 0x02023F54;
 battle_turn_random = 0x02023e80;
 battle_damage_multiplier = 0x02023FD2;
+battle_protect = 0x02023E8C;
 side_affecting_halfword = 0x2023DDE;
 
 item_get_quality = 0x0809A948|1;

data/moves/effect_table.S

@@ -95,7 +95,7 @@ m_effect_table:
 	.word 0x081D73E7 @86
 	.word 0x081D7403 @87
 	.word 0x081D741B @88
-	.word 0x081D7433 @89
+	.word bs_metal_burst_counter @89 COUNTER and METAL_BURST in one script for AI purposes
 	.word 0x081D7449 @90
 	.word 0x081D7465 @91
 	.word 0x081D749C @92
@@ -221,4 +221,6 @@ m_effect_table:
 	.word 0x081D85FB @212
 	.word 0x081D865F @213
         .word bs_bride   @214
-        //.word bs_lower_user_stat @215 lowers the stat of a user, for example hammer arm
+        .word bs_tailwind@215
+        .word bs_feint   @216
+        //.word bs_lower_user_stat @217 lowers the stat of a user, for example hammer arm

data/moves/move_data.S

@@ -40,7 +40,7 @@ move_data_kopfnuss:		.byte	31,			70,		0,		100,		15,		30,		0,		0,		51,		0,		0,		0
 move_data_hornattacke:		.byte	0,			65,		0,		100,		25,		0,		0,		0,		51,		0,		0,		0
 move_data_furienschlag:		.byte	29,			15,		0,		85,		20,		0,		0,		0,		51,		0,		0,		0
 move_data_hornbohrer:		.byte	38,			1,		0,		30,		5,		0,		0,		0,		19,		0,		0,		0
-move_data_tackle:		.byte	214,			40,		0,		100,		35,		0,		0,		0,		51,		0,		0,		0
+move_data_tackle:		.byte	0,			40,		0,		100,		35,		0,		0,		0,		51,		0,		0,		0
 move_data_bodyslam:		.byte	6,			85,		0,		100,		15,		30,		0,		0,		19,		0,		0,		0
 move_data_wickel:		.byte	42,			15,		0,		90,		20,		100,		0,		0,		51,		0,		0,		0
 move_data_bodycheck:		.byte	48,			90,		0,		85,		20,		0,		0,		0,		51,		0,		0,		0
@@ -376,12 +376,16 @@ move_data_gyroball:		.byte	MOVE_EFFECT_NONE,	25,		8,		100,		5,		0,		0,		0,		51,
 @TODO HEILOPFER
 move_data_heilopfer:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
 move_data_lake:                 .byte	214,			65,		11,		100,		10,		0,		0,		0,		50,		0,		1,		0
+@TODO BEERENKRAEFTE
 move_data_beerenkraefte:	.byte	MOVE_EFFECT_NONE,	1,		0,		100,		15,		0,		0,		0,		18,		0,		0,		0
-move_data_offenlegung:		.byte	MOVE_EFFECT_NONE,	30,		0,		100,		10,		0,		0,		2,		0,		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	MOVE_EFFECT_NONE,	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	MOVE_EFFECT_NONE,	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_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

data/pkmn_tables/pokemon_moveset_table.S

@@ -1218,7 +1218,7 @@ moveset_bisasam:
 .byte 0x1 
 .hword 0x2D 
 .byte 0x3 
-.hword MOVE_ROOST 
+.hword MOVE_FEINT 
 .byte 0x7 
 .hword 0x16 
 .byte 0x9 
@@ -1764,12 +1764,15 @@ moveset_tauboss:
 
 .align 2
 moveset_rattfratz: 
-.hword 0x27 
-.byte 0x1 
-.hword 0x21 
-.byte 0x1 
-.hword 0x62 
-.byte 0x4 
+
+.hword MOVE_METAL_BURST
+.byte 1
+//.hword 0x27 
+//.byte 0x1 
+//.hword 0x21 
+//.byte 0x1 
+//.hword 0x62 
+//.byte 0x4 
 .hword 0x74 
 .byte 0x7 
 .hword 0x2C 

nbproject/configurations.xml

@@ -4662,9 +4662,17 @@
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>
           </df>
+          <df name="feint">
+            <in>feint.c</in>
+            <in>feint_scripts.S</in>
+          </df>
           <df name="hazards">
             <in>hazards_scripts.S</in>
           </df>
+          <df name="metal_burst">
+            <in>metal_burst.c</in>
+            <in>metal_burst_script.S</in>
+          </df>
           <df name="power_trick">
             <in>power_trick.c</in>
             <in>power_trick_script.S</in>
@@ -4673,6 +4681,10 @@
             <in>roost.c</in>
             <in>roost_scripts.S</in>
           </df>
+          <df name="tailwind">
+            <in>tailwind.c</in>
+            <in>tailwind_scripts.S</in>
+          </df>
         </df>
         <df name="music">
           <in>main_mixer.S</in>
@@ -27349,11 +27361,25 @@
       </item>
       <item path="src/moves/fang_moves/fang_effect.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/feint/feint.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/feint/feint_scripts.S" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="src/moves/hazards/hazards_scripts.S"
             ex="false"
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/metal_burst/metal_burst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="src/moves/metal_burst/metal_burst_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/power_trick/power_trick.c"
             ex="false"
             tool="0"
@@ -27368,6 +27394,13 @@
       </item>
       <item path="src/moves/roost/roost_scripts.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/tailwind/tailwind.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/tailwind/tailwind_scripts.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

@@ -4053,12 +4053,18 @@
             </df>
             <df name="fang_moves">
             </df>
+            <df name="feint">
+            </df>
             <df name="hazards">
             </df>
+            <df name="metal_burst">
+            </df>
             <df name="power_trick">
             </df>
             <df name="roost">
             </df>
+            <df name="tailwind">
+            </df>
           </df>
           <df name="music">
           </df>
@@ -5278,6 +5284,7 @@
               <in>SEQ_BGM_CITY_03.s</in>
               <in>SEQ_BGM_CITY_04.s</in>
               <in>SEQ_BGM_CITY_05.s</in>
+              <in>SEQ_BGM_CITY_06.s</in>
               <in>SEQ_BGM_DEMO_AMER.s</in>
               <in>SEQ_BGM_DEMO_R.s</in>
               <in>SEQ_BGM_DEMO_RL.s</in>
@@ -5804,9 +5811,17 @@
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>
           </df>
+          <df name="feint">
+            <in>feint.c</in>
+            <in>feint_scripts.S</in>
+          </df>
           <df name="hazards">
             <in>hazards_scripts.S</in>
           </df>
+          <df name="metal_burst">
+            <in>metal_burst.c</in>
+            <in>metal_burst_script.S</in>
+          </df>
           <df name="power_trick">
             <in>power_trick.c</in>
             <in>power_trick_script.S</in>
@@ -5815,6 +5830,10 @@
             <in>roost.c</in>
             <in>roost_scripts.S</in>
           </df>
+          <df name="tailwind">
+            <in>tailwind.c</in>
+            <in>tailwind_scripts.S</in>
+          </df>
         </df>
         <df name="music">
           <in>main_mixer.S</in>

src/include/battle_structs.h

@@ -31,6 +31,38 @@ union main_status{
     struct status_main flags;
 };
 
+struct protect_struct{
+    u8 flag0_protect : 1;
+    u8 flag0_endure : 1;
+    u8 flag0_onlystruggle : 1;
+    u8 flag0_helpinghand : 1;
+    u8 flag0_bouncemove : 1;
+    u8 flag0_stealmove : 1;
+    u8 flag0_unknown: 1;
+    u8 flag0_prlz_immobility: 1;
+    u8 flag1_confusion_self_damage: 1;
+    u8 flag1_noteffective: 1;
+    u8 flag1_chargingturn: 1; //dive, dig etc.
+    u8 flag1_smokeballflee: 1;
+    u8 flag1_runaway_flee: 1;
+    u8 flag1_used_imprisoned_move: 1;
+    u8 flag1_love_immobility: 1;
+    u8 flag1_used_disabled_move: 1;
+    u8 flag2_used_taunted_move: 1;
+    u8 flag2_unknown: 1;
+    u8 flag2_flinch_immobility : 1;
+    u8 flag2_notfirststrike : 1;
+    u8 flag2_free: 4;
+    u8 field3;
+    u32 physical_damage;
+    u32 special_damage;
+    u8 counter_target;
+    u8 mirrorcoat_target;
+    u16 fieldE;
+};
+
+extern struct protect_struct battle_protect[4];
+
 #define STATUS_SLEEP 0x7
 #define STATUS_POISON 0x8
 #define STATUS_BURN 0x10

src/moves/feint/feint.c

@@ -0,0 +1,41 @@
+#include <battle.h>
+
+extern void* bs_feint_no_break_ptr;
+
+u8 break_shields() {
+    u8 side = get_side_from_bank(battle_defender_bank);
+    u8 effect = false;
+    struct bank_affecting* defender_bank = &custom_battle_elements.ptr->bank_affecting[battle_defender_bank];
+    struct side_affecting* defender_side = &custom_battle_elements.ptr->side_affecting[get_side_from_bank(battle_defender_bank)];
+    if (battle_protect[battle_defender_bank].flag0_protect) {
+        effect = true;
+        battle_protect[battle_defender_bank].flag0_protect = false;
+    }
+    if (defender_bank->kings_shield) {
+        effect = true;
+        defender_bank->kings_shield = false;
+    }
+    if (defender_bank->spiky_shield) {
+        effect = true;
+        defender_bank->spiky_shield = false;
+    }
+    if (defender_side->mat_block) {
+        effect = true;
+        defender_side->mat_block = false;
+    }
+    if (defender_side->quick_guard) {
+        effect = true;
+        defender_side->quick_guard = false;
+    }
+    if (defender_side->wide_guard) {
+        effect = true;
+        defender_side->wide_guard = false;
+    }
+    if (defender_side->crafty_shield) {
+        effect = true;
+        defender_side->crafty_shield = false;
+    }
+    if(effect)
+        return false;
+    battlescript_cursor = bs_feint_no_break_ptr;
+}

src/moves/feint/feint_scripts.S

@@ -0,0 +1,55 @@
+#include <battle_script.h>
+#include <moves.h>
+.align 2
+.text
+.thumb
+
+.global bs_feint
+bs_feint:
+    attackcanceler
+    accuracycheck 0x081D695E 0
+    attackstring
+    ppreduce
+    callasm break_shields+1
+normal_execute:
+    calculatedamage
+    attackanimation
+    waitanimation
+    missmessage
+    cmd5c 0x0
+    graphicalhpupdate 0
+    datahpupdate 0
+    critmessage
+    waitmessage 0x40
+    jumpifhalfword 0x0 0x02023D4A MOVE_FEINT feint_message
+    setword STRING_LOADER str_shield_break_normal
+    goto after_feint
+feint_message:
+    setword STRING_LOADER str_shield_break_feint
+after_feint:
+    printstring 0x184
+    waitmessage 0x40
+    faintpokemon 0x0 0x0 0x0
+    setbyte 0x2023FD8 0x0
+    cmd49 0x0 0x0
+    end
+    
+.global bs_feint_no_break
+bs_feint_no_break:
+    calculatedamage
+    attackanimation
+    waitanimation
+    missmessage
+    cmd5c 0x0
+    graphicalhpupdate 0
+    datahpupdate 0
+    critmessage
+    waitmessage 0x40
+    faintpokemon 0x0 0x0 0x0
+    setbyte 0x2023FD8 0x0
+    cmd49 0x0 0x0
+    end
+
+.global bs_feint_no_break_ptr
+bs_feint_no_break_ptr:
+    .word bs_feint_no_break

src/moves/metal_burst/metal_burst.c

@@ -0,0 +1,7 @@
+#include <battle.h>
+
+u8 metal_burst_dmg_reduction()
+{
+    battle_damage_store = battle_damage_store - (battle_damage_store >> 2);
+    return false;
+}

src/moves/metal_burst/metal_burst_script.S

@@ -0,0 +1,29 @@
+#include <battle_script.h>
+#include <moves.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_metal_burst_counter
+bs_metal_burst_counter:
+    jumpifhalfword 0x0 0x02023D4A MOVE_COUNTER 0x081D7433
+    attackcanceler
+    counterdamagecalculator try_mirror_coat
+    accuracycheck 0x81D695E 0x0
+    attackstring
+    ppreduce
+    damagecalc2
+    cmd69
+    callasm metal_burst_dmg_reduction+1
+    goto 0x81D6934
+
+try_mirror_coat:
+    mirrorcoatdamagecalculator 0x081D7DF0
+    accuracycheck 0x81D695E 0x0
+    attackstring
+    ppreduce
+    damagecalc2
+    cmd69
+    callasm metal_burst_dmg_reduction+1
+    goto 0x81D6934

src/moves/tailwind/tailwind.c

@@ -0,0 +1,16 @@
+#include <battle.h>
+
+extern void* bs_tailwind_failed_ptr;
+
+u8 set_tailwind()
+{
+    struct side_affecting* current_side = &custom_battle_elements.ptr->side_affecting[get_side_from_bank(battle_attacker_bank)];
+    if(!current_side->tailwind)
+    {
+        current_side->tailwind = 5;
+        current_side->tailwind_bank = battle_attacker_bank;
+        return false;
+    }
+    battlescript_cursor = (void*)(0x081D7DF0);
+    return true;
+}

src/moves/tailwind/tailwind_scripts.S

@@ -0,0 +1,20 @@
+#include <battle_script.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_tailwind
+bs_tailwind:
+    attackcanceler
+    callasm set_tailwind+1
+    attackstring
+    ppreduce
+    attackanimation
+    waitanimation
+    setword STRING_LOADER str_tailwind
+    printstring 0x184
+    waitmessage 0x40
+    goto 0x081D694E
+
+

string/de/shield_break.txt

@@ -0,0 +1,2 @@
+str_shield_break_normal=Schilde gebrochen und so.
+str_shield_break_feint=Offenlegung und so.

string/de/tailwind.txt

@@ -0,0 +1 @@
+str_tailwind=Die Pokémon, die auf deiner Seite\nkämpfen, erhalten Rückenwind!