Browse Source

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

SBird1337 8 years ago
parent
commit
e7c594ff0d

+ 1
- 1
bpre.sym View File

@@ -89,9 +89,9 @@ battle_defender_p_bank = 0x02023D6E;
89 89
 battle_attack_effectivity = 0x02023DCC;
90 90
 battle_weather = 0x02023F1C;
91 91
 battle_damage_store = 0x02023D50;
92
+battle_base_power = 0x02023F50;
92 93
 battle_string_message_table = 0x083FDF3C;
93 94
 battle_crit_loc = 0x02023D71;
94
-battle_base_power = 0x02024020;
95 95
 battle_side_unknown = 0x02023FDB;
96 96
 battle_side_timers = 0x02023DE4;
97 97
 battle_hitmarker = 0x02023dd0;

+ 2
- 0
data/moves/effect_table.S View File

@@ -226,3 +226,5 @@ m_effect_table:
226 226
         .word bs_close_combat @217
227 227
         .word bs_pay_back@218
228 228
         .word bs_assurance@219
229
+        .word bs_crush_grip_like    @220
230
+        .word bs_power_trick    @221

+ 2
- 3
data/moves/move_data.S View File

@@ -386,7 +386,6 @@ move_data_rueckenwind:		.byte	215,                    0,		2,		0,		15,		0,		16,
386 386
 move_data_akupressur:		.byte	MOVE_EFFECT_NONE,			0,		0,		0,		30,		0,		16,		0,		4,		0,		2,		0
387 387
 move_data_metallstoss:		.byte	89,                     1,		8,		100,		10,		0,		1,		0,		0,		0,		0,		0
388 388
 move_data_kehrtwende:		.byte	127,            	70,		6,		100,		20,		0,		0,		0,		51,		0,		0,		0
389
-
390 389
 move_data_nahkampf:		.byte	217,            	120,		1,		100,		5,		100,		0,		0,		51,		0,		0,		0
391 390
 move_data_gegenstoss:		.byte	218,            	50,		17,		100,		10,		0,		0,		0,		51,		0,		0,		0
392 391
 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
395 394
 move_data_psybann:		.byte	MOVE_EFFECT_NONE,	0,		14,		100,		10,		0,		0,		0,		18,		0,		2,		0
396 395
 move_data_trumpfkarte:		.byte	MOVE_EFFECT_NONE,	1,		0,		100,		5,		0,		0,		0,		51,		0,		1,		0
397 396
 move_data_heilblockade:		.byte	MOVE_EFFECT_NONE,	0,		14,		100,		15,		0,		8,		0,		18,		0,		2,		0
398
-move_data_auswringen:		.byte	MOVE_EFFECT_NONE,	120,		0,		100,		5,		0,		0,		0,		51,		0,		1,		0
399
-move_data_krafttrick:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		0,		0,		4,		0,		2,		0
397
+move_data_auswringen:		.byte	220,			1,		0,		100,		5,		0,		0,		0,		51,		0,		1,		0
398
+move_data_krafttrick:		.byte	221,            	0,		14,		0,		10,		0,		0,		0,		4,		0,		2,		0
400 399
 move_data_magensaefte:		.byte	MOVE_EFFECT_NONE,	0,		3,		100,		10,		0,		0,		0,		50,		0,		2,		0
401 400
 move_data_beschwoerung:		.byte	MOVE_EFFECT_NONE,	0,		0,		0,		30,		0,		16,		0,		4,		0,		2,		0
402 401
 move_data_egotrip:		.byte	MOVE_EFFECT_NONE,	0,		0,		0,		20,		0,		0,		0,		2,		0,		2,		0

+ 1
- 1
data/pkmn_tables/pokemon_moveset_table.S View File

@@ -1218,7 +1218,7 @@ moveset_bisasam:
1218 1218
 .byte 0x1 
1219 1219
 .hword 0x2D 
1220 1220
 .byte 0x3 
1221
-.hword MOVE_THUNDER
1221
+.hword MOVE_WRING_OUT
1222 1222
 .byte 0x7 
1223 1223
 .hword 0x16 
1224 1224
 .byte 0x9 

+ 14
- 0
nbproject/configurations.xml View File

@@ -4666,6 +4666,10 @@
4666 4666
             <in>close_combat.c</in>
4667 4667
             <in>close_combat_scripts.S</in>
4668 4668
           </df>
4669
+          <df name="crush_grip_like">
4670
+            <in>crush_grip_like_script.S</in>
4671
+            <in>hp_damage_mod.c</in>
4672
+          </df>
4669 4673
           <df name="fang_moves">
4670 4674
             <in>fang_animations.S</in>
4671 4675
             <in>fang_effect.S</in>
@@ -27386,6 +27390,16 @@
27386 27390
             tool="4"
27387 27391
             flavor2="0">
27388 27392
       </item>
27393
+      <item path="src/moves/crush_grip_like/crush_grip_like_script.S"
27394
+            ex="false"
27395
+            tool="4"
27396
+            flavor2="0">
27397
+      </item>
27398
+      <item path="src/moves/crush_grip_like/hp_damage_mod.c"
27399
+            ex="false"
27400
+            tool="0"
27401
+            flavor2="0">
27402
+      </item>
27389 27403
       <item path="src/moves/fang_moves/fang_animations.S"
27390 27404
             ex="false"
27391 27405
             tool="4"

+ 6
- 0
nbproject/private/configurations.xml View File

@@ -4055,6 +4055,8 @@
4055 4055
             </df>
4056 4056
             <df name="close_combat">
4057 4057
             </df>
4058
+            <df name="crush_grip_like">
4059
+            </df>
4058 4060
             <df name="fang_moves">
4059 4061
             </df>
4060 4062
             <df name="feint">
@@ -5823,6 +5825,10 @@
5823 5825
             <in>close_combat.c</in>
5824 5826
             <in>close_combat_scripts.S</in>
5825 5827
           </df>
5828
+          <df name="crush_grip_like">
5829
+            <in>crush_grip_like_script.S</in>
5830
+            <in>hp_damage_mod.c</in>
5831
+          </df>
5826 5832
           <df name="fang_moves">
5827 5833
             <in>fang_animations.S</in>
5828 5834
             <in>fang_effect.S</in>

+ 4
- 0
patches/move_table.asm View File

@@ -204,10 +204,14 @@
204 204
 .word move_table
205 205
 .org 0x0803ECE8
206 206
 .word move_table
207
+.org 0x0803ED3C
208
+.word move_table
207 209
 .org 0x0803ED60
208 210
 .word move_table
209 211
 .org 0x0803F254
210 212
 .word move_table
213
+.org 0x0803F3B4
214
+.word move_table
211 215
 .org 0x0803F510
212 216
 .word move_table
213 217
 .org 0x0804105C

+ 1
- 0
src/include/battle_locations.h View File

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

+ 30
- 0
src/moves/crush_grip_like/crush_grip_like_script.S View File

@@ -0,0 +1,30 @@
1
+#include <battle_script.h>
2
+
3
+.align 2
4
+.text
5
+.thumb
6
+
7
+.global bs_crush_grip_like
8
+bs_crush_grip_like:
9
+    attackcanceler
10
+    accuracycheck 0x081D695E 0
11
+    attackstring    
12
+    ppreduce
13
+    callasm hp_damage_mod+1
14
+    calculatedamage
15
+    attackanimation
16
+    waitanimation
17
+    missmessage
18
+    cmd5c 0x0
19
+    waitstate
20
+    graphicalhpupdate 0x0
21
+    datahpupdate 0x0
22
+    critmessage
23
+    waitmessage 0x40
24
+    resultmessage
25
+    waitmessage 0x40
26
+    seteffectwithchancetarget
27
+    faintpokemon 0x0 0x0 0x0
28
+    setbyte 0x2023FD8 0x0
29
+    cmd49 0x0 0x0
30
+    end

+ 9
- 0
src/moves/crush_grip_like/hp_damage_mod.c View File

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