flare blitz, magnet rise

bpre.sym

@@ -106,6 +106,7 @@ battle_damage_multiplier = 0x02023FD2;
 battle_protect = 0x02023E8C;
 side_affecting_halfword = 0x2023DDE;
 battle_turn_order = 0x02023bde;
+battle_status_3 = 0x02023DFC;
 
 item_get_quality = 0x0809A948|1;
 item_get_x12 = 0x0809A924|1;

data/moves/effect_table.S

@@ -131,7 +131,7 @@ m_effect_table:
 	.word 0x081D7962 @122
 	.word 0x081D7954 @123
 	.word 0x081D796E @124
-	.word 0x081D7977 @125
+	.word bs_flare_blitz @125   also used for flame wheel, scald, steam eruption
 	.word 0x081D7982 @126
 	.word bs_uturn_btpass @127 (uturn, volt switch, baton pass)
 	.word 0x081D6900 @128
@@ -232,4 +232,5 @@ m_effect_table:
         .word bs_gastro_acid        @223
         .word bs_swap_moves         @224
         .word bs_punishment         @225
-        .word bs_change_ability     @226
+        .word bs_change_ability     @226
+        .word bs_magnet_rise        @227

data/moves/move_data.S

@@ -411,8 +411,8 @@ move_data_tiefschlag:		.byte	MOVE_EFFECT_NONE,	80,		17,		100,		5,		0,		0,		1,		5
 move_data_giftspitzen:		.byte	112,            	0,		3,		0,		20,		0,		64,		0,		0,		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
+move_data_magnetflug:		.byte	227,            	0,		13,		0,		10,		0,		16,		0,		0,		0,		2,		0
+move_data_flammenblitz:		.byte	125,            	120,		10,		100,		15,		0,		0,		0,		51,		0,		0,		0
 move_data_kraftwelle:		.byte	6,			60,		1,		100,		10,		0,		0,		0,		51,		0,		0,		0
 move_data_aurasphaere:		.byte	17,			80,		1,		0,		20,		0,		0,		0,		50,		0,		1,		0
 move_data_steinpolitur:		.byte	52,			0,		5,		0,		20,		0,		0,		0,		4,		0,		2,		0

data/pkmn_tables/pokemon_moveset_table.S

@@ -1218,7 +1218,7 @@ moveset_bisasam:
 .byte 0x1 
 .hword MOVE_HOWL 
 .byte 0x3 
-.hword MOVE_WORRY_SEED
+.hword MOVE_MAGNET_RISE
 .byte 0x7 
 .hword MOVE_HYPNOSIS
 .byte 0x7

nbproject/configurations.xml

@@ -4682,6 +4682,9 @@
             <in>feint.c</in>
             <in>feint_scripts.S</in>
           </df>
+          <df name="flare_blitz">
+            <in>flare_blitz_script.S</in>
+          </df>
           <df name="gastro_acid">
             <in>gastro_acid.c</in>
             <in>gastro_acid_script.S</in>
@@ -4693,6 +4696,10 @@
             <in>lucky_chant.c</in>
             <in>lucky_chant_script.S</in>
           </df>
+          <df name="magnet_rise">
+            <in>magnet_rise.c</in>
+            <in>magnet_rise_script.S</in>
+          </df>
           <df name="metal_burst">
             <in>metal_burst.c</in>
             <in>metal_burst_script.S</in>
@@ -27441,6 +27448,11 @@
       </item>
       <item path="src/moves/feint/feint_scripts.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/flare_blitz/flare_blitz_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/gastro_acid/gastro_acid.c"
             ex="false"
             tool="0"
@@ -27466,6 +27478,16 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/magnet_rise/magnet_rise.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="src/moves/magnet_rise/magnet_rise_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/metal_burst/metal_burst.c"
             ex="false"
             tool="0"

nbproject/private/configurations.xml

@@ -4063,12 +4063,16 @@
             </df>
             <df name="feint">
             </df>
+            <df name="flare_blitz">
+            </df>
             <df name="gastro_acid">
             </df>
             <df name="hazards">
             </df>
             <df name="lucky_chant">
             </df>
+            <df name="magnet_rise">
+            </df>
             <df name="metal_burst">
             </df>
             <df name="pay_back">
@@ -5851,6 +5855,9 @@
             <in>feint.c</in>
             <in>feint_scripts.S</in>
           </df>
+          <df name="flare_blitz">
+            <in>flare_blitz_script.S</in>
+          </df>
           <df name="gastro_acid">
             <in>gastro_acid.c</in>
             <in>gastro_acid_script.S</in>
@@ -5862,6 +5869,10 @@
             <in>lucky_chant.c</in>
             <in>lucky_chant_script.S</in>
           </df>
+          <df name="magnet_rise">
+            <in>magnet_rise.c</in>
+            <in>magnet_rise_script.S</in>
+          </df>
           <df name="metal_burst">
             <in>metal_burst.c</in>
             <in>metal_burst_script.S</in>

src/include/battle_structs.h

@@ -177,6 +177,30 @@ struct in_battle_weather{
     u32 air_current : 1;
 };
 
+struct status_3{
+    u32 leech_seed_hp_receiver : 2; // 2 bits
+    u32 leech_seed : 1; //4
+    u32 always_hits : 2; //x8 | x10
+    u32 perish_song : 1; //x20
+    u32 on_air : 1; //x40
+    u32 underground : 1;//80
+    u32 minimized : 1; //x100
+    u32 charged_up : 1; //x200
+    u32 rooted : 1; //x400
+    u32 yawn : 2; //x800 || x1000
+    u32 imprision : 1; //x2000
+    u32 grudge : 1; //x4000
+    u32 unkown_no_crit : 1; //x8000
+    u32 mud_sport : 1; //x10 000
+    u32 watersport : 1; //x20 000
+    u32 underwater : 1; //x40 000
+    u32 switchinlock : 1; //x80 000
+    u32 unburden : 1; //x100 000 (previously trace)
+    u32 phantomforce : 1; //x200 000
+};
+
+extern struct status_3 battle_status_3[4];
+
 union battle_weather{
     u32 int_bw;
     struct in_battle_weather flags;

src/moves/flare_blitz/flare_blitz_script.S

@@ -0,0 +1,35 @@
+#include <battle_script.h>
+#include <moves.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_flare_blitz
+bs_flare_blitz:
+
+    setbyte 0x2023E85 0x3
+    jumpifhalfword 0x0 0x2023D4A MOVE_FLARE_BLITZ flare_blitz
+    goto 0x81D6900
+
+flare_blitz:
+    attackcanceler
+    accuracycheck 0x81D695E 0x0
+    attackstring
+    ppreduce
+    calculatedamage
+    attackanimation
+    waitanimation
+    missmessage
+    cmd5c BANK_TARGET
+    waitstate
+    graphicalhpupdate BANK_TARGET   
+    datahpupdate BANK_TARGET
+    critmessage
+    waitmessage DELAY_1SECOND
+    resultmessage
+    waitmessage DELAY_1SECOND
+    seteffectwithchancetarget
+    setbyte 0x2023E85 0xE6
+    seteffectwithchancetarget
+    goto 0x81D6947

src/moves/magnet_rise/magnet_rise.c

@@ -0,0 +1,14 @@
+#include <battle.h>
+
+u8 set_magnet_rise() {
+    struct bank_affecting* user = &custom_battle_elements.ptr->bank_affecting[battle_attacker_bank];
+    if (user->magnet_rise || user->smacked_down || battle_status_3[battle_attacker_bank].rooted) {
+        //we failed
+        battlescript_cursor = (void*) (0x081D7DF0);
+        return true;
+    } else {
+        user->magnet_rise = 5;
+        return false;
+    }
+    return false;
+}

src/moves/magnet_rise/magnet_rise_script.S

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

string/de/move_strings.txt

@@ -7,4 +7,5 @@ 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!
-str_worry_seed=\hFD\h10 nimmt die Fähigkeit\nInsomnia an!
+str_worry_seed=\hFD\h10 nimmt die Fähigkeit\nInsomnia an!
+str_magnet_rise=\hFD\h0F schwebt aufgrund von\nElektromagnetismus!