added close combat

data/moves/animation_table.S

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

data/moves/effect_table.S

@@ -223,4 +223,4 @@ m_effect_table:
         .word bs_bride   @214
         .word bs_tailwind@215
         .word bs_feint   @216
-        //.word bs_lower_user_stat @217 lowers the stat of a user, for example hammer arm
+        .word bs_close_combat @217

data/moves/move_data.S

@@ -385,9 +385,9 @@ move_data_rueckenwind:		.byte	215,                    0,		2,		0,		15,		0,		16,
 @TODO AKUPRESSUR
 move_data_akupressur:		.byte	214,			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
-@TODO KEHRTWENDE
 move_data_kehrtwende:		.byte	127,            	70,		6,		100,		20,		0,		0,		0,		51,		0,		0,		0
-move_data_nahkampf:		.byte	MOVE_EFFECT_NONE,	120,		1,		100,		5,		100,		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_itemsperre:		.byte	MOVE_EFFECT_NONE,	0,		17,		100,		15,		0,		0,		0,		26,		0,		2,		0

data/pkmn_tables/pokemon_moveset_table.S

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

nbproject/configurations.xml

@@ -4658,6 +4658,10 @@
             <in>bride.c</in>
             <in>bride_scripts.S</in>
           </df>
+          <df name="close_combat">
+            <in>close_combat.c</in>
+            <in>close_combat_scripts.S</in>
+          </df>
           <df name="fang_moves">
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>
@@ -27357,6 +27361,16 @@
       </item>
       <item path="src/moves/bride/bride_scripts.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/moves/close_combat/close_combat.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="src/moves/close_combat/close_combat_scripts.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/fang_moves/fang_animations.S"
             ex="false"
             tool="4"

nbproject/private/configurations.xml

@@ -4051,6 +4051,8 @@
             </df>
             <df name="bride">
             </df>
+            <df name="close_combat">
+            </df>
             <df name="fang_moves">
             </df>
             <df name="feint">
@@ -5809,6 +5811,10 @@
             <in>bride.c</in>
             <in>bride_scripts.S</in>
           </df>
+          <df name="close_combat">
+            <in>close_combat.c</in>
+            <in>close_combat_scripts.S</in>
+          </df>
           <df name="fang_moves">
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>

nbproject/private/private.xml

@@ -7,28 +7,92 @@
         <activeConfTypeElem>0</activeConfTypeElem>
         <activeConfIndexElem>0</activeConfIndexElem>
     </data>
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1">
+        <file>
+            <url>data/moves/move_data.S</url>
+            <bookmark id="1">
+                <name/>
+                <line>8</line>
+                <key/>
+            </bookmark>
+        </file>
+    </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/split_physical_special.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/bpre.h</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/table.tbl</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn_hook.S</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/main.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_data.txt</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/item_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/dynamic_overworld_hooks.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst_script.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/config.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/roost/roost_scripts.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/moves.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/trainer_run.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/move_table.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc.c</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/disable_cry_table_blocks.s</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_locations.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/bride/bride.c</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/item_effects.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/music.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/specials/custom_specials.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/sprites.makefile</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/overworld.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/effect_table.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/makefile</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_data.txt</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/dynamic_overworld_hooks.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/moves.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/pkmn_tables/pokemon_moveset_table.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld_hooks.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/battle_engine.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/icons.makefile</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_limits.asm</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/tm_fixes.asm</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_descriptions.txt</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/hazards.txt</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/hooks.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/music.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_switch_in_hook.S</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/tm_hm_move_table.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/move_strings.txt</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_routines.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/animation_table.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/uturn/u_turn_script.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/item_scripts.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/gfx_build/overworlds/.gitignore</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/linker.ld</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind_scripts.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/trainer.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/battle_engine/bs_table.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_structs.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_initiative.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/special.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/custom_structs.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/hazards.txt</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc_hook.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_test.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/assets.makefile</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/bride/bride_scripts.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint_scripts.S</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_tables.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/makefile</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/gfx_build/sprites/back_sprites/.gitignore</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/split_physical_special.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/malloc.asm</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/tailwind.txt</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/bpre.sym</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/roost/roost.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/hazards/hazards_scripts.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_script.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards_hook.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/move_data.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/move_strings.txt</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_abilities.h</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/items.asm</file>
         </group>
     </open-files>

src/moves/close_combat/close_combat.c

@@ -0,0 +1,27 @@
+#include <battle.h>
+
+extern void* bs_cc_lower_def;
+extern void* bs_cc_lower_sdef;
+extern void* bs_cc_lower_both;
+
+u8 close_combat_choose_script() {
+    if (battle_participants[battle_attacker_bank].def_buff == 0) {
+        if (battle_participants[battle_attacker_bank].sp_def_buff == 0)
+        {
+            battlescript_cursor = (void*) (0x081D694E);
+            return true;
+        }
+        else
+        {
+            battlescript_cursor = bs_cc_lower_sdef;
+            return true;
+        }
+    } else if (battle_participants[battle_attacker_bank].sp_def_buff == 0) {
+        battlescript_cursor = bs_cc_lower_def;
+        return true;
+    } else {
+        battlescript_cursor = bs_cc_lower_both;
+        return true;
+    }
+    return false;
+}

src/moves/close_combat/close_combat_scripts.S

@@ -0,0 +1,90 @@
+#include <battle_script.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_close_combat
+bs_close_combat:
+    attackcanceler
+    accuracycheck 0x081D695E 0
+    attackstring
+    ppreduce
+    calculatedamage
+    attackanimation
+    waitanimation
+    missmessage
+    cmd5c 0
+    waitstate
+    graphicalhpupdate 0
+    datahpupdate 0
+    critmessage
+    waitmessage 0x40
+    resultmessage
+    waitmessage 0x40
+    faintpokemon 0 0 0
+    callasm close_combat_choose_script+1
+
+bs_lower_def:
+    setbyte 0x02023FDF 0
+    playstatchangeanimation 1 0x20 1
+    setbyte 0x02023FDE 0x95
+    statbuffchange 0x41 0x081D694E
+    jumpifbyte 0 0x02023FDE 0x2 0x081D694E
+    printfromtable 0x083FE588
+    waitmessage 0x40
+    goto 0x081D694E
+
+bs_lower_sdef:
+    setbyte 0x2023FDF 0x0
+    playstatchangeanimation 0x1 0x4 0x1
+    setbyte 0x2023FDE 0x92
+    statbuffchange 0x41 0x081D694E
+    jumpifbyte 0x0 0x02023FDE 0x2 0x081D694E
+    printfromtable 0x83FE588
+    waitmessage 0x40
+    goto 0x081D694E
+
+bs_lower_both:
+    setbyte 0x2023FDF 0x0
+    playstatchangeanimation 0x1 0x24 0x1
+    setbyte 0x2023FDE 0x92
+    statbuffchange 0x41 0x081D694E
+    jumpifbyte 0x0 0x02023FDE 0x2 0x081D694E
+    printfromtable 0x83FE588
+    waitmessage 0x40
+    setbyte 0x2023FDE 0x95
+    statbuffchange 0x41 0x081D694E
+    jumpifbyte 0x0 0x02023FDE 0x2 0x081D694E
+    printfromtable 0x83FE588
+    waitmessage 0x40
+    goto 0x081D694E
+
+.global bs_cc_lower_def
+bs_cc_lower_def:
+    .word bs_lower_def
+
+.global bs_cc_lower_sdef
+bs_cc_lower_sdef:
+    .word bs_lower_sdef
+
+.global bs_cc_lower_both
+bs_cc_lower_both:
+    .word bs_lower_both
+
+.global as_close_combat
+as_close_combat:
+    .byte 0x14, 0x09, 0x17, 0x03, 0x2D, 0xB8, 0x0B, 0x08, 0x05, 0x04, 0x00, 0xF7, 0x00, 0x00, 0x01, 0x00
+    .byte 0xFF, 0xFF, 0x00, 0x97, 0x27, 0x00, 0x9F, 0x27, 0x0A, 0x03, 0x0C, 0x0C, 0x08, 0x03, 0x7D, 0x90
+    .byte 0x09, 0x08, 0x02, 0x05, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04
+    .byte 0x02, 0x08, 0x7C, 0x3E, 0x08, 0x02, 0x04, 0xF1, 0xFF, 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19
+    .byte 0x74, 0x00, 0x3F, 0x04, 0x01, 0x03, 0xF9, 0x89, 0x09, 0x08, 0x02, 0x05, 0x01, 0x00, 0x05, 0x00
+    .byte 0x00, 0x00, 0x19, 0x00, 0x01, 0x00, 0x02, 0x10, 0x67, 0x3E, 0x08, 0x03, 0x05, 0xF1, 0xFF, 0x12
+    .byte 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x08, 0x7C, 0x3E, 0x08, 0x02, 0x04
+    .byte 0x00, 0x00, 0xFC, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0x74, 0x00, 0x3F, 0x04, 0x01, 0x02, 0x10
+    .byte 0x67, 0x3E, 0x08, 0x03, 0x05, 0x00, 0x00, 0xFC, 0xFF, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04
+    .byte 0x03, 0x02, 0x08, 0x7C, 0x3E, 0x08, 0x02, 0x04, 0x0F, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00
+    .byte 0x19, 0x74, 0x00, 0x3F, 0x04, 0x01, 0x02, 0x10, 0x67, 0x3E, 0x08, 0x03, 0x05, 0x0F, 0x00, 0x09
+    .byte 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05, 0x02, 0x84, 0x4E, 0x3D, 0x08, 0x02, 0x03
+    .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x0B, 0x03, 0x0D, 0x0E, 0xC7, 0x59, 0x1D, 0x08, 0x08
+