more moves

gastro acid, power swap, guard swap, heart swap, lucky chant,
punishment

bpre.sym

@@ -91,6 +91,7 @@ battle_weather = 0x02023F1C;
 battle_damage_store = 0x02023D50;
 battle_base_power = 0x02023F50;
 battle_string_message_table = 0x083FDF3C;
+battle_string_chooser = 0x0203C020;
 battle_crit_loc = 0x02023D71;
 battle_side_unknown = 0x02023FDB;
 battle_side_timers = 0x02023DE4;

data/moves/effect_table.S

@@ -222,9 +222,13 @@ m_effect_table:
 	.word 0x081D865F @213
         .word bs_bride   @214
         .word bs_tailwind@215
-        .word bs_feint   @216
-        .word bs_close_combat @217
-        .word bs_pay_back@218
-        .word bs_assurance@219
+        .word bs_feint              @216
+        .word bs_close_combat       @217
+        .word bs_pay_back           @218
+        .word bs_assurance          @219
         .word bs_crush_grip_like    @220
-        .word bs_power_trick    @221
+        .word bs_power_trick        @221
+        .word bs_lucky_chant        @222
+        .word bs_gastro_acid        @223
+        .word bs_swap_moves         @224
+        .word bs_punishment         @225

data/moves/move_data.S

@@ -396,18 +396,18 @@ move_data_trumpfkarte:		.byte	MOVE_EFFECT_NONE,	1,		0,		100,		5,		0,		0,		0,		51
 move_data_heilblockade:		.byte	MOVE_EFFECT_NONE,	0,		14,		100,		15,		0,		8,		0,		18,		0,		2,		0
 move_data_auswringen:		.byte	220,			1,		0,		100,		5,		0,		0,		0,		51,		0,		1,		0
 move_data_krafttrick:		.byte	221,            	0,		14,		0,		10,		0,		0,		0,		4,		0,		2,		0
-move_data_magensaefte:		.byte	MOVE_EFFECT_NONE,	0,		3,		100,		10,		0,		0,		0,		50,		0,		2,		0
-move_data_beschwoerung:		.byte	MOVE_EFFECT_NONE,	0,		0,		0,		30,		0,		16,		0,		4,		0,		2,		0
+move_data_magensaefte:		.byte	223,            	0,		3,		100,		10,		0,		0,		0,		50,		0,		2,		0
+move_data_beschwoerung:		.byte	222,            	0,		0,		0,		30,		0,		16,		0,		4,		0,		2,		0
 move_data_egotrip:		.byte	MOVE_EFFECT_NONE,	0,		0,		0,		20,		0,		0,		0,		2,		0,		2,		0
 move_data_imitator:		.byte	9,			0,		0,		0,		20,		0,		1,		0,		0,		0,		2,		0
-move_data_krafttausch:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		16,		0,		2,		0,		2,		0
-move_data_schutztausch:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		0,		0,		2,		0,		2,		0
-move_data_strafattacke:		.byte	MOVE_EFFECT_NONE,	60,		17,		100,		5,		0,		0,		0,		51,		0,		0,		0
+move_data_krafttausch:		.byte	224,            	0,		14,		0,		10,		0,		16,		0,		2,		0,		2,		0
+move_data_schutztausch:		.byte	224,                	0,		14,		0,		10,		0,		0,		0,		2,		0,		2,		0
+move_data_strafattacke:		.byte	225,            	1,		17,		100,		5,		0,		0,		0,		51,		0,		0,		0
 move_data_zuflucht:		.byte	MOVE_EFFECT_NONE,	140,		0,		100,		5,		0,		0,		0,		51,		0,		0,		0
 move_data_sorgensamen:		.byte	MOVE_EFFECT_NONE,	0,		12,		100,		10,		0,		0,		0,		26,		0,		2,		0
 move_data_tiefschlag:		.byte	MOVE_EFFECT_NONE,	80,		17,		100,		5,		0,		0,		1,		51,		0,		0,		0
 move_data_giftspitzen:		.byte	MOVE_EFFECT_NONE,	0,		3,		0,		20,		0,		64,		0,		0,		0,		2,		0
-move_data_statustausch:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		0,		0,		2,		0,		2,		0
+move_data_statustausch:		.byte	224,            	0,		14,		0,		10,		0,		0,		0,		2,		0,		2,		0
 move_data_wasserring:		.byte	181,			0,		11,		0,		20,		0,		16,		0,		4,		0,		2,		0
 move_data_magnetflug:		.byte	MOVE_EFFECT_NONE,	0,		13,		0,		10,		0,		16,		0,		0,		0,		2,		0
 move_data_flammenblitz:		.byte	MOVE_EFFECT_NONE,	120,		10,		100,		15,		0,		0,		0,		51,		0,		0,		0

data/pkmn_tables/pokemon_moveset_table.S

@@ -1216,12 +1216,12 @@ moveset_unknown:
 moveset_bisasam: 
 .hword MOVE_TACKLE
 .byte 0x1 
-.hword 0x2D 
+.hword MOVE_HOWL 
 .byte 0x3 
-.hword MOVE_WRING_OUT
+.hword MOVE_PUNISHMENT
 .byte 0x7 
-.hword 0x16 
-.byte 0x9 
+.hword MOVE_GUARD_SWAP
+.byte 0x7
 .hword 0x4D 
 .byte 0xD 
 .hword 0x4F 
@@ -1765,7 +1765,7 @@ moveset_tauboss:
 .align 2
 moveset_rattfratz: 
 
-.hword MOVE_METAL_BURST
+.hword MOVE_SWORDS_DANCE
 .byte 1
 //.hword 0x27 
 //.byte 0x1 

nbproject/configurations.xml

@@ -4678,9 +4678,17 @@
             <in>feint.c</in>
             <in>feint_scripts.S</in>
           </df>
+          <df name="gastro_acid">
+            <in>gastro_acid.c</in>
+            <in>gastro_acid_script.S</in>
+          </df>
           <df name="hazards">
             <in>hazards_scripts.S</in>
           </df>
+          <df name="lucky_chant">
+            <in>lucky_chant.c</in>
+            <in>lucky_chant_script.S</in>
+          </df>
           <df name="metal_burst">
             <in>metal_burst.c</in>
             <in>metal_burst_script.S</in>
@@ -4693,10 +4701,18 @@
             <in>power_trick.c</in>
             <in>power_trick_script.S</in>
           </df>
+          <df name="punishment">
+            <in>punishment.c</in>
+            <in>punishment_script.S</in>
+          </df>
           <df name="roost">
             <in>roost.c</in>
             <in>roost_scripts.S</in>
           </df>
+          <df name="swap_moves">
+            <in>swap_moves.c</in>
+            <in>swap_moves_script.S</in>
+          </df>
           <df name="tailwind">
             <in>tailwind.c</in>
             <in>tailwind_scripts.S</in>
@@ -27411,11 +27427,31 @@
       </item>
       <item path="src/moves/feint/feint_scripts.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/gastro_acid/gastro_acid.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="src/moves/gastro_acid/gastro_acid_script.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/lucky_chant/lucky_chant.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="src/moves/lucky_chant/lucky_chant_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/metal_burst/metal_burst.c"
             ex="false"
             tool="0"
@@ -27443,10 +27479,24 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/punishment/punishment.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/punishment/punishment_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/roost/roost.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="src/moves/roost/roost_scripts.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/swap_moves/swap_moves.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/swap_moves/swap_moves_script.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"

nbproject/private/configurations.xml

@@ -4061,16 +4061,24 @@
             </df>
             <df name="feint">
             </df>
+            <df name="gastro_acid">
+            </df>
             <df name="hazards">
             </df>
+            <df name="lucky_chant">
+            </df>
             <df name="metal_burst">
             </df>
             <df name="pay_back">
             </df>
             <df name="power_trick">
             </df>
+            <df name="punishment">
+            </df>
             <df name="roost">
             </df>
+            <df name="swap_moves">
+            </df>
             <df name="tailwind">
             </df>
             <df name="uturn">
@@ -5837,9 +5845,17 @@
             <in>feint.c</in>
             <in>feint_scripts.S</in>
           </df>
+          <df name="gastro_acid">
+            <in>gastro_acid.c</in>
+            <in>gastro_acid_script.S</in>
+          </df>
           <df name="hazards">
             <in>hazards_scripts.S</in>
           </df>
+          <df name="lucky_chant">
+            <in>lucky_chant.c</in>
+            <in>lucky_chant_script.S</in>
+          </df>
           <df name="metal_burst">
             <in>metal_burst.c</in>
             <in>metal_burst_script.S</in>
@@ -5852,10 +5868,18 @@
             <in>power_trick.c</in>
             <in>power_trick_script.S</in>
           </df>
+          <df name="punishment">
+            <in>punishment.c</in>
+            <in>punishment_script.S</in>
+          </df>
           <df name="roost">
             <in>roost.c</in>
             <in>roost_scripts.S</in>
           </df>
+          <df name="swap_moves">
+            <in>swap_moves.c</in>
+            <in>swap_moves_script.S</in>
+          </df>
           <df name="tailwind">
             <in>tailwind.c</in>
             <in>tailwind_scripts.S</in>

src/include/battle_locations.h

@@ -3,6 +3,7 @@
 
 u8 battle_active_bank;
 u8 battle_stat_changer;
+void* battle_string_chooser;
 u16 battle_executed_move;
 u8 battle_attacker_bank;
 u8 battle_defender_bank;

src/moves/gastro_acid/gastro_acid.c

@@ -0,0 +1,10 @@
+#include <battle.h>
+
+u8 gastro_acid_set() {
+    if (custom_battle_elements.ptr->bank_affecting[battle_defender_bank].gastro_acided) {
+        battlescript_cursor = (void*) (0x081D7DF0);
+        return true;
+    }
+    custom_battle_elements.ptr->bank_affecting[battle_defender_bank].gastro_acided = true;
+    return false;
+}

src/moves/gastro_acid/gastro_acid_script.S

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

src/moves/lucky_chant/lucky_chant.c

@@ -0,0 +1,14 @@
+#include <battle.h>
+
+u8 lucky_chant_set()
+{
+    u8 attacker_side = get_side_from_bank(battle_attacker_bank);
+    if(custom_battle_elements.ptr->side_affecting[attacker_side].lucky_chant)
+    {
+        battlescript_cursor = (void*)(0x081D7DF0);
+        return true;
+    }
+    custom_battle_elements.ptr->side_affecting[attacker_side].lucky_chant = 5;
+    custom_battle_elements.ptr->side_affecting[attacker_side].lucky_chant_bank = battle_attacker_bank;
+    return false; 
+}

src/moves/lucky_chant/lucky_chant_script.S

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

src/moves/power_trick/power_trick_script.S

@@ -12,7 +12,7 @@ ppreduce
 callasm power_trick_swap+1
 attackanimation
 waitanimation
-setword STRING_LOADER str_power_swap
+setword STRING_LOADER str_power_trick
 printstring 0x184
 waitmessage 0x40
 goto 0x081D694E

src/moves/punishment/punishment.c

@@ -0,0 +1,18 @@
+#include <battle.h>
+
+u8 punishment_damage_mod()
+{
+    struct battle_participant* defender = &battle_participants[battle_defender_bank];
+    u8 status_count = 
+            (defender->hp_buff > 6 ? defender->hp_buff - 6 : 0) + 
+            (defender->atk_buff > 6 ? defender->atk_buff - 6 : 0) + 
+            (defender->def_buff > 6 ? defender->def_buff - 6 : 0) +
+            (defender->sp_atk_buff > 6 ? defender->sp_atk_buff - 6 : 0) +
+            (defender->sp_def_buff > 6 ? defender->sp_def_buff - 6 : 0) +
+            (defender->spd_buff > 6 ? defender->spd_buff - 6 : 0) +
+            (defender->evasion_buff > 6 ? defender->evasion_buff - 6 : 0);
+    battle_base_power = 60 + (status_count * 20);
+    if(battle_base_power > 200)
+        battle_base_power = 200;
+    return false;
+}

src/moves/punishment/punishment_script.S

@@ -0,0 +1,30 @@
+#include <battle_script.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_punishment
+bs_punishment:
+    attackcanceler
+    accuracycheck 0x081D695E 0
+    attackstring    
+    ppreduce
+    callasm punishment_damage_mod+1
+    calculatedamage
+    attackanimation
+    waitanimation
+    missmessage
+    cmd5c 0x0
+    waitstate
+    graphicalhpupdate 0x0
+    datahpupdate 0x0
+    critmessage
+    waitmessage 0x40
+    resultmessage
+    waitmessage 0x40
+    seteffectwithchancetarget
+    faintpokemon 0x0 0x0 0x0
+    setbyte 0x2023FD8 0x0
+    cmd49 0x0 0x0
+    end

src/moves/swap_moves/swap_moves.c

@@ -0,0 +1,62 @@
+#include <battle.h>
+
+extern void* str_power_swap_ref;
+extern void* str_guard_swap_ref;
+extern void* str_heart_swap_ref;
+
+u8 set_swap_moves() {
+    struct battle_participant* attacker = &battle_participants[battle_attacker_bank];
+    struct battle_participant* defender = &battle_participants[battle_defender_bank];
+    u8 swap;
+    switch (battle_executed_move) {
+        case MOVE_POWER_SWAP:
+            swap = attacker->atk_buff;
+            attacker->atk_buff = defender->atk_buff;
+            defender->atk_buff = swap;
+            swap = attacker->sp_atk_buff;
+            attacker->sp_atk_buff = defender->sp_atk_buff;
+            defender->sp_atk_buff = swap;
+            battle_string_chooser = str_power_swap_ref;
+            break;
+        case MOVE_GUARD_SWAP:
+            swap = attacker->def_buff;
+            attacker->def_buff = defender->def_buff;
+            defender->def_buff = swap;
+            swap = attacker->sp_def_buff;
+            attacker->sp_def_buff = defender->sp_def_buff;
+            defender->sp_def_buff = swap;
+            battle_string_chooser = str_guard_swap_ref;
+            break;
+        case MOVE_HEART_SWAP:
+            swap = attacker->hp_buff;
+            attacker->hp_buff = defender->hp_buff;
+            defender->hp_buff = swap;
+
+            swap = attacker->spd_buff;
+            attacker->spd_buff = defender->spd_buff;
+            defender->spd_buff = swap;
+
+            swap = attacker->evasion_buff;
+            attacker->evasion_buff = defender->evasion_buff;
+            defender->evasion_buff = swap;
+
+            swap = attacker->atk_buff;
+            attacker->atk_buff = defender->atk_buff;
+            defender->atk_buff = swap;
+
+            swap = attacker->sp_atk_buff;
+            attacker->sp_atk_buff = defender->sp_atk_buff;
+            defender->sp_atk_buff = swap;
+
+            swap = attacker->atk_buff;
+            attacker->atk_buff = defender->atk_buff;
+            defender->atk_buff = swap;
+
+            swap = attacker->sp_atk_buff;
+            attacker->sp_atk_buff = defender->sp_atk_buff;
+            defender->sp_atk_buff = swap;
+            battle_string_chooser = str_heart_swap_ref;
+            break;
+    }
+    return false;
+}

src/moves/swap_moves/swap_moves_script.S

@@ -0,0 +1,19 @@
+#include <battle_script.h>
+
+.align 2
+.text
+.thumb
+
+.global bs_swap_moves
+bs_swap_moves:
+    attackcanceler
+    attackstring
+    ppreduce
+    callasm set_swap_moves+1
+    attackanimation
+    waitanimation
+    printstring 0x184
+    waitmessage 0x40
+    goto 0x081D694E
+
+

string/de/lucky_chant.txt

@@ -0,0 +1 @@
+str_lucky_chant=Beschwörung schützt dein Team\nvor kritischen Treffern!

string/de/move_strings.txt

@@ -1 +1,9 @@
-str_power_swap=\hFD\h0F tauscht Angriff und\nVerteidigung!
+str_power_trick=\hFD\h0F tauscht Angriff und\nVerteidigung!
+str_lucky_chant=Beschwörung schützt dein Team\nvor kritischen Treffern!
+str_shield_break_normal=Schilde gebrochen und so.
+str_shield_break_feint=Offenlegung und so.
+str_tailwind=Die Pokémon, die auf deiner Seite\nkämpfen, erhalten Rückenwind!
+str_gastro_acid=Die Fähigkeit von \hFD\h10\nwurde unterdrückt!
+str_power_swap=\hFD\h0F tauscht seinen Angriff\nund Spezialangriff mit dem Ziel!
+str_guard_swap=\hFD\h0F tauscht seine Verteidigung\nund Spezialverteidigung mit dem Ziel!
+str_heart_swap=\hFD\h0F tauscht seine Statusveränderungen\nmit den Ziel!

string/de/shield_break.txt

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

string/de/tailwind.txt

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