wring out, fix some major move bugs (removed pss split for now)

bpre.sym

@@ -89,9 +89,9 @@ battle_defender_p_bank = 0x02023D6E;
 battle_attack_effectivity = 0x02023DCC;
 battle_weather = 0x02023F1C;
 battle_damage_store = 0x02023D50;
+battle_base_power = 0x02023F50;
 battle_string_message_table = 0x083FDF3C;
 battle_crit_loc = 0x02023D71;
-battle_base_power = 0x02024020;
 battle_side_unknown = 0x02023FDB;
 battle_side_timers = 0x02023DE4;
 battle_hitmarker = 0x02023dd0;

data/moves/effect_table.S

@@ -226,3 +226,5 @@ m_effect_table:
         .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

data/moves/move_data.S

@@ -386,7 +386,6 @@ move_data_rueckenwind:		.byte	215,                    0,		2,		0,		15,		0,		16,
 move_data_akupressur:		.byte	MOVE_EFFECT_NONE,			0,		0,		0,		30,		0,		16,		0,		4,		0,		2,		0
 move_data_metallstoss:		.byte	89,                     1,		8,		100,		10,		0,		1,		0,		0,		0,		0,		0
 move_data_kehrtwende:		.byte	127,            	70,		6,		100,		20,		0,		0,		0,		51,		0,		0,		0
-
 move_data_nahkampf:		.byte	217,            	120,		1,		100,		5,		100,		0,		0,		51,		0,		0,		0
 move_data_gegenstoss:		.byte	218,            	50,		17,		100,		10,		0,		0,		0,		51,		0,		0,		0
 move_data_gewissheit:		.byte	219,			60,		17,		100,		10,		0,		0,		0,		51,		0,		0,		0
@@ -395,8 +394,8 @@ move_data_schleuder:		.byte	MOVE_EFFECT_NONE,	1,		17,		100,		10,		0,		0,		0,		18
 move_data_psybann:		.byte	MOVE_EFFECT_NONE,	0,		14,		100,		10,		0,		0,		0,		18,		0,		2,		0
 move_data_trumpfkarte:		.byte	MOVE_EFFECT_NONE,	1,		0,		100,		5,		0,		0,		0,		51,		0,		1,		0
 move_data_heilblockade:		.byte	MOVE_EFFECT_NONE,	0,		14,		100,		15,		0,		8,		0,		18,		0,		2,		0
-move_data_auswringen:		.byte	MOVE_EFFECT_NONE,	120,		0,		100,		5,		0,		0,		0,		51,		0,		1,		0
-move_data_krafttrick:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		0,		0,		4,		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_egotrip:		.byte	MOVE_EFFECT_NONE,	0,		0,		0,		20,		0,		0,		0,		2,		0,		2,		0

data/pkmn_tables/pokemon_moveset_table.S

@@ -1218,7 +1218,7 @@ moveset_bisasam:
 .byte 0x1 
 .hword 0x2D 
 .byte 0x3 
-.hword MOVE_THUNDER
+.hword MOVE_WRING_OUT
 .byte 0x7 
 .hword 0x16 
 .byte 0x9 

nbproject/configurations.xml

@@ -4666,6 +4666,10 @@
             <in>close_combat.c</in>
             <in>close_combat_scripts.S</in>
           </df>
+          <df name="crush_grip_like">
+            <in>crush_grip_like_script.S</in>
+            <in>hp_damage_mod.c</in>
+          </df>
           <df name="fang_moves">
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>
@@ -27386,6 +27390,16 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/crush_grip_like/crush_grip_like_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
+      <item path="src/moves/crush_grip_like/hp_damage_mod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
       <item path="src/moves/fang_moves/fang_animations.S"
             ex="false"
             tool="4"

nbproject/private/configurations.xml

@@ -4055,6 +4055,8 @@
             </df>
             <df name="close_combat">
             </df>
+            <df name="crush_grip_like">
+            </df>
             <df name="fang_moves">
             </df>
             <df name="feint">
@@ -5823,6 +5825,10 @@
             <in>close_combat.c</in>
             <in>close_combat_scripts.S</in>
           </df>
+          <df name="crush_grip_like">
+            <in>crush_grip_like_script.S</in>
+            <in>hp_damage_mod.c</in>
+          </df>
           <df name="fang_moves">
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>

patches/move_table.asm

@@ -204,10 +204,14 @@
 .word move_table
 .org 0x0803ECE8
 .word move_table
+.org 0x0803ED3C
+.word move_table
 .org 0x0803ED60
 .word move_table
 .org 0x0803F254
 .word move_table
+.org 0x0803F3B4
+.word move_table
 .org 0x0803F510
 .word move_table
 .org 0x0804105C

src/include/battle_locations.h

@@ -12,5 +12,6 @@ u32 battle_hitmarker;
 void* battlescript_cursor;
 u8 battle_menu_chosen_item[4];
 u8 battle_turn_order[4];
+u16 battle_base_power;
 
 #endif

src/moves/crush_grip_like/crush_grip_like_script.S

@@ -0,0 +1,30 @@
+#include <battle_script.h>
+
+.align 2
+.text
+.thumb
+
+.global bs_crush_grip_like
+bs_crush_grip_like:
+    attackcanceler
+    accuracycheck 0x081D695E 0
+    attackstring    
+    ppreduce
+    callasm hp_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/crush_grip_like/hp_damage_mod.c

@@ -0,0 +1,9 @@
+#include <battle.h>
+
+u8 hp_damage_mod()
+{
+    battle_base_power = battle_participants[battle_defender_bank].current_hp * 120;
+    battle_base_power /= battle_participants[battle_defender_bank].max_hp;
+    battle_base_power++;
+    return false;
+}