added payback and assurance

bpre.sym

@@ -103,6 +103,7 @@ battle_turn_random = 0x02023e80;
 battle_damage_multiplier = 0x02023FD2;
 battle_protect = 0x02023E8C;
 side_affecting_halfword = 0x2023DDE;
+battle_turn_order = 0x02023bde;
 
 item_get_quality = 0x0809A948|1;
 item_get_x12 = 0x0809A924|1;

data/moves/animation_table.S

@@ -375,7 +375,7 @@ m_animation_table:
 .word as_metal_burst @368
 .word as_uturn @369
 .word as_close_combat @370
-.word 0x081C6F34 @371
+.word as_pay_back @371
 .word 0x081C6F34 @372
 .word 0x081C6F34 @373
 .word 0x081C6F34 @374

data/moves/effect_table.S

@@ -224,3 +224,5 @@ m_effect_table:
         .word bs_tailwind@215
         .word bs_feint   @216
         .word bs_close_combat @217
+        .word bs_pay_back@218
+        .word bs_assurance@219

data/moves/move_data.S

@@ -383,13 +383,13 @@ move_data_offenlegung:		.byte	216,            	30,		0,		100,		10,		0,		0,		2,		0
 move_data_pfluecker:		.byte	MOVE_EFFECT_NONE,	60,		2,		100,		20,		0,		0,		0,		51,		0,		0,		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_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	MOVE_EFFECT_NONE,	50,		17,		100,		10,		0,		0,		0,		51,		0,		0,		0
-move_data_gewissheit:		.byte	215,			60,		17,		100,		10,		0,		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
 move_data_itemsperre:		.byte	MOVE_EFFECT_NONE,	0,		17,		100,		15,		0,		0,		0,		26,		0,		2,		0
 move_data_schleuder:		.byte	MOVE_EFFECT_NONE,	1,		17,		100,		10,		0,		0,		0,		18,		0,		0,		0
 move_data_psybann:		.byte	MOVE_EFFECT_NONE,	0,		14,		100,		10,		0,		0,		0,		18,		0,		2,		0
@@ -439,9 +439,9 @@ move_data_patronenhieb:		.byte	0,			40,		8,		100,		30,		0,		0,		1,		51,		0,		0,
 move_data_lawine:		.byte	185,			60,		15,		100,		10,		0,		8,		252,		51,		0,		0,		0
 move_data_eissplitter:		.byte	0,			40,		15,		100,		30,		0,		0,		1,		50,		0,		0,		0
 move_data_dunkelklaue:		.byte	43,			70,		7,		100,		15,		0,		0,		0,		51,		0,		0,		0
-move_data_donnerzahn:		.byte	MOVE_EFFECT_NONE,	65,		13,		95,		15,		0,		0,		0,		51,		0,		0,		0
-move_data_eiszahn:		.byte	MOVE_EFFECT_NONE,	65,		15,		95,		15,		0,		0,		0,		51,		0,		0,		0
-move_data_feuerzahn:		.byte	MOVE_EFFECT_NONE,	65,		10,		95,		15,		0,		0,		0,		51,		0,		0,		0
+move_data_donnerzahn:		.byte	31,             	65,		13,		95,		15,		0,		0,		0,		51,		0,		0,		0
+move_data_eiszahn:		.byte	31,             	65,		15,		95,		15,		0,		0,		0,		51,		0,		0,		0
+move_data_feuerzahn:		.byte	31,                     65,		10,		95,		15,		0,		0,		0,		51,		0,		0,		0
 move_data_schattenstoss:	.byte	MOVE_EFFECT_NONE,	40,		7,		100,		30,		0,		0,		0,		51,		0,		0,		0
 move_data_schlammbombe:		.byte	73,			65,		4,		85,		10,		30,		0,		0,		50,		0,		1,		0
 move_data_psychoklinge:		.byte	43,			70,		14,		100,		20,		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_CLOSE_COMBAT 
+.hword MOVE_THUNDER
 .byte 0x7 
 .hword 0x16 
 .byte 0x9 

nbproject/configurations.xml

@@ -4645,6 +4645,10 @@
           </df>
         </df>
         <df name="moves">
+          <df name="assurance">
+            <in>assurance.c</in>
+            <in>assurance_script.S</in>
+          </df>
           <df name="battle_engine">
             <in>bs_table.S</in>
             <in>cmd_callasm.S</in>
@@ -4677,6 +4681,10 @@
             <in>metal_burst.c</in>
             <in>metal_burst_script.S</in>
           </df>
+          <df name="pay_back">
+            <in>pay_back.c</in>
+            <in>pay_back_script.S</in>
+          </df>
           <df name="power_trick">
             <in>power_trick.c</in>
             <in>power_trick_script.S</in>
@@ -27325,6 +27333,13 @@
       </item>
       <item path="src/item/tmhm/tm_save_block.S" ex="false" tool="4" 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"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/battle_engine/bs_table.S" ex="false" tool="4" flavor2="0">
       </item>
       <item path="src/moves/battle_engine/cmd_callasm.S"
@@ -27397,6 +27412,13 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/pay_back/pay_back.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/pay_back/pay_back_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/power_trick/power_trick.c"
             ex="false"
             tool="0"

nbproject/private/configurations.xml

@@ -4047,6 +4047,8 @@
             </df>
           </df>
           <df name="moves">
+            <df name="assurance">
+            </df>
             <df name="battle_engine">
             </df>
             <df name="bride">
@@ -4061,6 +4063,8 @@
             </df>
             <df name="metal_burst">
             </df>
+            <df name="pay_back">
+            </df>
             <df name="power_trick">
             </df>
             <df name="roost">
@@ -5798,6 +5802,10 @@
           </df>
         </df>
         <df name="moves">
+          <df name="assurance">
+            <in>assurance.c</in>
+            <in>assurance_script.S</in>
+          </df>
           <df name="battle_engine">
             <in>bs_table.S</in>
             <in>cmd_callasm.S</in>
@@ -5830,6 +5838,10 @@
             <in>metal_burst.c</in>
             <in>metal_burst_script.S</in>
           </df>
+          <df name="pay_back">
+            <in>pay_back.c</in>
+            <in>pay_back_script.S</in>
+          </df>
           <df name="power_trick">
             <in>power_trick.c</in>
             <in>power_trick_script.S</in>

src/include/battle_locations.h

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

src/moves/assurance/assurance.c

@@ -0,0 +1,7 @@
+#include <battle.h>
+
+u8 assurance_damage_modifier()
+{
+    if((battle_protect[battle_defender_bank].physical_damage + battle_protect[battle_defender_bank].special_damage) > 0)
+        battle_damage_multiplier *=2;
+}

src/moves/assurance/assurance_script.S

@@ -0,0 +1,12 @@
+#include <battle_script.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_assurance
+bs_assurance:
+    callasm assurance_damage_modifier+1
+    goto 0x081D6900
+
+

src/moves/pay_back/pay_back.c

@@ -0,0 +1,8 @@
+#include <battle.h>
+
+u8 pay_back_damage_modifier()
+{
+    if(battle_turn_order[battle_attacker_bank] > battle_turn_order[battle_defender_bank])
+        battle_damage_multiplier *=2;
+    return false;
+}

src/moves/pay_back/pay_back_script.S

@@ -0,0 +1,27 @@
+#include <battle_script.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_pay_back
+bs_pay_back:
+    callasm pay_back_damage_modifier+1
+    goto 0x081D6900 @normal damaging move
+
+.global as_pay_back
+as_pay_back:
+    .byte 0x14, 0x00, 0x17, 0x00, 0x97, 0x27, 0x00, 0x9F, 0x27, 0x0A, 0x03, 0x0C, 0x0C, 0x08, 0x03, 0x7D
+    .byte 0x90, 0x09, 0x08, 0x02, 0x05, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00, 0x01, 0x00, 0x04, 0x00, 0x19
+    .byte 0x73, 0x00, 0xC0, 0x05, 0x02, 0x9C, 0x4E, 0x3D, 0x08, 0x02, 0x05, 0x00, 0x00, 0x14, 0x00, 0x00
+    .byte 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x02, 0x08, 0x7C, 0x3E, 0x08, 0x02, 0x04, 0xF1, 0xFF
+    .byte 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x74, 0x00, 0x3F, 0x04, 0x01, 0x03, 0xF9, 0x89, 0x09
+    .byte 0x08, 0x02, 0x05, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x19, 0x00, 0x01, 0x00, 0x02, 0x10, 0x67
+    .byte 0x3E, 0x08, 0x03, 0x05, 0xF1, 0xFF, 0x12, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x03
+    .byte 0x02, 0x08, 0x7C, 0x3E, 0x08, 0x02, 0x04, 0x00, 0x00, 0xFC, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19
+    .byte 0x74, 0x00, 0x3F, 0x04, 0x01, 0x02, 0x10, 0x67, 0x3E, 0x08, 0x03, 0x05, 0x00, 0x00, 0xFC, 0xFF
+    .byte 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x08, 0x7C, 0x3E, 0x08, 0x02, 0x04, 0x0F
+    .byte 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x74, 0x00, 0x3F, 0x04, 0x01, 0x02, 0x10, 0x67
+    .byte 0x3E, 0x08, 0x03, 0x05, 0x0F, 0x00, 0x09, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05
+    .byte 0x02, 0x84, 0x4E, 0x3D, 0x08, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x0B, 0x03
+    .byte 0x0D, 0x0E, 0xC7, 0x59, 0x1D, 0x08, 0x08