worry seed

bpre.sym

@@ -82,6 +82,7 @@ battle_participants	= 0x02023BE4;
 battle_data_ability = 0x02023C04;
 battle_data_current_hp = 0x02023C0C;
 battle_executed_move = 0x02023D4A;
+battle_last_used_ability = 0x02023D6A;
 battle_attacker_bank = 0x02023D6B;
 battle_defender_bank = 0x02023D6C;
 battle_attacker_p_bank = 0x02023D6D;

data/moves/effect_table.S

@@ -231,4 +231,5 @@ m_effect_table:
         .word bs_lucky_chant        @222
         .word bs_gastro_acid        @223
         .word bs_swap_moves         @224
-        .word bs_punishment         @225
+        .word bs_punishment         @225
+        .word bs_change_ability     @226

data/moves/move_data.S

@@ -398,15 +398,17 @@ 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	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
+@TODO EGOTRIP
 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	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
+@TODO LAST RESORT
 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_sorgensamen:		.byte	226,            	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_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

data/pkmn_tables/pokemon_moveset_table.S

@@ -626,7 +626,7 @@ moveset_table:
 .word moveset_karippas
 .word moveset_flapteryx
 .word moveset_aeropteryx
-.word moveset_unratütox
+.word moveset_unratütox
 .word moveset_deponitox
 .word moveset_zorua
 .word moveset_zoroark
@@ -689,7 +689,7 @@ moveset_table:
 .word moveset_washakwil
 .word moveset_skallyk
 .word moveset_grypheldis
-.word moveset_furnifraß
+.word moveset_furnifraß
 .word moveset_fermicula
 .word moveset_kapuno
 .word moveset_duodino
@@ -727,10 +727,10 @@ moveset_table:
 .word moveset_vivillon
 .word moveset_leufeo
 .word moveset_pyroleo
-.word moveset_flabébé
+.word moveset_flabébé
 .word moveset_floette
 .word moveset_florges
-.word moveset_mähikel
+.word moveset_mähikel
 .word moveset_chevrumm
 .word moveset_pam_pam
 .word moveset_pandagro
@@ -1054,16 +1054,16 @@ moveset_table:
 .word moveset_barschuft
 .word moveset_schalellos
 .word moveset_gastrodon
-.word moveset_flabébé
+.word moveset_flabébé
 .word moveset_floette
 .word moveset_florges
-.word moveset_flabébé
+.word moveset_flabébé
 .word moveset_floette
 .word moveset_florges
-.word moveset_flabébé
+.word moveset_flabébé
 .word moveset_floette
 .word moveset_florges
-.word moveset_flabébé
+.word moveset_flabébé
 .word moveset_floette
 .word moveset_florges
 .word moveset_zygarde
@@ -1218,9 +1218,9 @@ moveset_bisasam:
 .byte 0x1 
 .hword MOVE_HOWL 
 .byte 0x3 
-.hword MOVE_PUNISHMENT
+.hword MOVE_WORRY_SEED
 .byte 0x7 
-.hword MOVE_GUARD_SWAP
+.hword MOVE_HYPNOSIS
 .byte 0x7
 .hword 0x4D 
 .byte 0xD 
@@ -21651,7 +21651,7 @@ moveset_aeropteryx:
 .byte 0xFF, 0x0
 
 .align 2
-moveset_unratütox: 
+moveset_unratütox: 
 .hword 0x8B 
 .byte 0x1 
 .hword 0x1 
@@ -24112,7 +24112,7 @@ moveset_grypheldis:
 .byte 0xFF, 0x0
 
 .align 2
-moveset_furnifraß: 
+moveset_furnifraß: 
 .hword 0x1FE 
 .byte 0x1 
 .hword 0x205 
@@ -25556,7 +25556,7 @@ moveset_pyroleo:
 .byte 0xFF, 0x0
 
 .align 2
-moveset_flabébé: 
+moveset_flabébé: 
 .hword 0x21 
 .byte 0x1 
 .hword 0x16 
@@ -25651,7 +25651,7 @@ moveset_florges:
 .byte 0xFF, 0x0
 
 .align 2
-moveset_mähikel: 
+moveset_mähikel: 
 .hword 0x21 
 .byte 0x1 
 .hword 0x4A 

nbproject/configurations.xml

@@ -4645,6 +4645,10 @@
           </df>
         </df>
         <df name="moves">
+          <df name="ability_changers">
+            <in>ability_change_script.S</in>
+            <in>worry_seed.c</in>
+          </df>
           <df name="assurance">
             <in>assurance.c</in>
             <in>assurance_script.S</in>
@@ -27353,6 +27357,16 @@
       </item>
       <item path="src/item/tmhm/tm_save_block.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/ability_changers/ability_change_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
+      <item path="src/moves/ability_changers/worry_seed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
       <item path="src/moves/assurance/assurance.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="src/moves/assurance/assurance_script.S"

nbproject/private/configurations.xml

@@ -4047,6 +4047,8 @@
             </df>
           </df>
           <df name="moves">
+            <df name="ability_changers">
+            </df>
             <df name="assurance">
             </df>
             <df name="battle_engine">
@@ -5812,6 +5814,10 @@
           </df>
         </df>
         <df name="moves">
+          <df name="ability_changers">
+            <in>ability_change_script.S</in>
+            <in>worry_seed.c</in>
+          </df>
           <df name="assurance">
             <in>assurance.c</in>
             <in>assurance_script.S</in>

nbproject/project.xml

@@ -7,7 +7,7 @@
             <c-extensions>c</c-extensions>
             <cpp-extensions/>
             <header-extensions>h</header-extensions>
-            <sourceEncoding>ISO-8859-1</sourceEncoding>
+            <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects/>
             <sourceRootList>
                 <sourceRootElem>.</sourceRootElem>

src/include/battle_locations.h

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

src/moves/ability_changers/ability_change_script.S

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

src/moves/ability_changers/worry_seed.c

@@ -0,0 +1,22 @@
+#include <battle.h>
+
+extern void* str_worry_seed_ref;
+
+u8 worry_seed()
+{
+    u8 def_ability = battle_participants[battle_defender_bank].ability_id;
+    if(def_ability == ABILITY_STANCE_CHANGE && def_ability == ABILITY_MULTITYPE && def_ability == ABILITY_TRUANT)
+    {
+        //we fail
+        battlescript_cursor = (void*) (0x081D7DF0);
+        return true;
+    }
+    else
+    {
+        battle_participants[battle_defender_bank].ability_id = ABILITY_INSOMNIA;
+        battle_last_used_ability = ABILITY_INSOMNIA;
+        battle_string_chooser = str_worry_seed_ref;
+        return false;
+    }
+    return false;
+}

src/moves/punishment/punishment.c

@@ -1,18 +1,18 @@
 #include <battle.h>
 
-u8 punishment_damage_mod()
-{
+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) + 
+    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)
+    if (battle_base_power > 200)
         battle_base_power = 200;
     return false;
 }

string/de/lucky_chant.txt

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

string/de/move_strings.txt

@@ -6,4 +6,5 @@ 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!
+str_heart_swap=\hFD\h0F tauscht seine Statusveränderungen\nmit den Ziel!
+str_worry_seed=\hFD\h10 nimmt die Fähigkeit\nInsomnia an!