defog, healing wish, trick room, magic room, wonder room

bpre.sym

@@ -111,6 +111,12 @@ battle_status_3 = 0x02023DFC;
 item_get_quality = 0x0809A948|1;
 item_get_x12 = 0x0809A924|1;
 
+party_player = 0x02024284;
+party_opponent = 0x0202402C;
+
+get_attributes = 0x0803FBE8|1;
+set_attributes = 0x0804037C|1;
+
 
 battle_status3_bits_pbs = 0x02023DFC;
 

data/moves/animation_table.S

@@ -465,7 +465,7 @@ m_animation_table:
 .word 0x081C6F34 @458
 .word 0x081C6F34 @459
 .word 0x081C6F34 @460
-.word 0x081C6F34 @461
+.word as_lunar_dance @461
 .word 0x081C6F34 @462
 .word 0x081C6F34 @463
 .word 0x081C6F34 @464

data/moves/effect_table.S

@@ -30,7 +30,7 @@ m_effect_table:
 	.word 0x081D6900 @21
 	.word 0x081D6900 @22
 	.word 0x081D6C02 @23
-	.word 0x081D6C0D @24
+	.word bs_defog   @24    Also used for sweet scent
 	.word 0x081D6C72 @25
 	.word 0x081D6C83 @26
 	.word 0x081D6C97 @27
@@ -233,4 +233,6 @@ m_effect_table:
         .word bs_swap_moves         @224
         .word bs_punishment         @225
         .word bs_change_ability     @226
-        .word bs_magnet_rise        @227
+        .word bs_magnet_rise        @227
+        .word bs_rooms              @228
+        .word bs_healing_wish       @229

data/moves/move_data.S

@@ -435,7 +435,7 @@ move_data_sturzflug:		.byte	198,			120,		2,		100,		15,		0,		0,		0,		51,		0,		0,
 move_data_erdkraefte:		.byte	72,			90,		4,		100,		10,		10,		0,		0,		50,		0,		1,		0
 move_data_wechseldich:		.byte	177,			0,		17,		100,		10,		0,		0,		0,		18,		0,		2,		0
 move_data_gigastoss:		.byte	80,			150,		0,		90,		5,		0,		0,		0,		51,		0,		0,		0
-move_data_raenkeschmied:	.byte	MOVE_EFFECT_NONE,	0,		17,		0,		20,		0,		0,		0,		4,		0,		2,		0
+move_data_raenkeschmied:	.byte	53,             	0,		17,		0,		20,		0,		0,		0,		4,		0,		2,		0
 move_data_patronenhieb:		.byte	0,			40,		8,		100,		30,		0,		0,		1,		51,		0,		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
@@ -443,15 +443,15 @@ move_data_dunkelklaue:		.byte	43,			70,		7,		100,		15,		0,		0,		0,		51,		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_schattenstoss:	.byte	0,              	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
 move_data_zen_kopfstoss:	.byte	31,			80,		14,		90,		15,		0,		0,		0,		51,		0,		0,		0
 move_data_spiegelsalve:		.byte	73,			65,		8,		85,		10,		30,		0,		0,		50,		0,		1,		0
 move_data_lichtkanone:		.byte	72,			80,		8,		100,		10,		0,		0,		0,		50,		0,		1,		0
 move_data_kraxler:		.byte	76,			90,		0,		85,		20,		20,		0,		0,		51,		0,		0,		0
-move_data_auflockern:		.byte	MOVE_EFFECT_NONE,	0,		2,		0,		15,		0,		0,		0,		26,		0,		2,		0
-move_data_bizarroraum:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		5,		0,		16,		0,		0,		0,		2,		0
+move_data_auflockern:		.byte	24,             	0,		2,		100,		15,		0,		0,		0,		26,		0,		2,		0
+move_data_bizarroraum:		.byte	228,            	0,		14,		0,		5,		0,		16,		0,		0,		0,		2,		0
 move_data_draco_meteor:		.byte	204,			130,		16,		90,		5,		0,		0,		0,		50,		0,		1,		0
 move_data_ladungsstoss:		.byte	6,			80,		13,		100,		15,		30,		32,		0,		50,		0,		1,		0
 move_data_flammensturm:		.byte	4,			80,		10,		100,		15,		30,		32,		0,		50,		0,		1,		0
@@ -464,7 +464,7 @@ move_data_eisenschaedel:	.byte	31,			80,		8,		100,		15,		30,		0,		0,		51,		0,		0
 move_data_magnetbombe:		.byte	17,			60,		8,		0,		20,		0,		0,		0,		50,		0,		0,		0
 move_data_steinkante:		.byte	43,			100,		5,		80,		5,		0,		0,		0,		50,		0,		0,		0
 move_data_liebreiz:		.byte	MOVE_EFFECT_NONE,	0,		0,		100,		20,		0,		0,		0,		26,		0,		2,		0
-move_data_tarnsteine:		.byte	MOVE_EFFECT_NONE,	0,		5,		0,		20,		0,		64,		0,		8,		0,		2,		0
+move_data_tarnsteine:		.byte	112,                	0,		5,		0,		20,		0,		64,		0,		8,		0,		2,		0
 move_data_strauchler:		.byte	196,			1,		12,		100,		20,		0,		0,		0,		51,		0,		1,		0
 move_data_geschwaetz:		.byte	76,			65,		2,		100,		20,		100,		0,		0,		50,		0,		1,		0
 move_data_urteilskraft:		.byte	MOVE_EFFECT_NONE,	100,		0,		100,		10,		0,		0,		0,		50,		0,		1,		0
@@ -479,8 +479,8 @@ move_data_kopfstoss:		.byte	198,			150,		5,		80,		5,		0,		0,		0,		51,		0,		0,		0
 move_data_doppelschlag:		.byte	44,			35,		0,		90,		10,		0,		0,		0,		51,		0,		0,		0
 move_data_zeitenlaerm:		.byte	80,			150,		16,		90,		5,		0,		0,		0,		50,		0,		1,		0
 move_data_raumschlag:		.byte	43,			100,		16,		95,		5,		0,		0,		0,		51,		0,		1,		0
-move_data_lunartanz:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		0,		0,		0,		0,		2,		0
-move_data_quetschgriff:		.byte	MOVE_EFFECT_NONE,	120,		0,		100,		5,		0,		0,		0,		51,		0,		0,		0
+move_data_lunartanz:		.byte	229,            	0,		14,		0,		10,		0,		0,		0,		0,		0,		2,		0
+move_data_quetschgriff:		.byte	220,            	120,		0,		100,		5,		0,		0,		0,		51,		0,		0,		0
 move_data_lavasturm:		.byte	42,			100,		10,		75,		5,		100,		0,		0,		50,		0,		1,		0
 move_data_schlummerort:		.byte	1,			0,		17,		80,		10,		100,		8,		0,		26,		0,		2,		0
 move_data_schocksamen:		.byte	MOVE_EFFECT_NONE,	120,		12,		85,		5,		40,		0,		0,		50,		0,		1,		0
@@ -490,13 +490,13 @@ move_data_klauenwetzer:		.byte	MOVE_EFFECT_NONE,	0,		17,		0,		15,		0,		16,		0,
 move_data_rundumschutz:		.byte	MOVE_EFFECT_NONE,	0,		5,		0,		10,		0,		16,		3,		0,		0,		2,		0
 move_data_schutzteiler:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
 move_data_kraftteiler:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
-move_data_wunderraum:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
+move_data_wunderraum:		.byte	228,                	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
 move_data_psychoschock:		.byte	MOVE_EFFECT_NONE,	80,		14,		100,		10,		0,		0,		0,		50,		0,		1,		0
 move_data_giftschock:		.byte	MOVE_EFFECT_NONE,	65,		3,		100,		10,		0,		0,		0,		50,		0,		1,		0
 move_data_autotomie:		.byte	MOVE_EFFECT_NONE,	0,		8,		0,		15,		0,		0,		0,		4,		0,		2,		0
 move_data_wutpulver:		.byte	172,			0,		6,		0,		20,		0,		16,		2,		0,		0,		2,		0
 move_data_telekinese:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		15,		0,		0,		0,		26,		0,		2,		0
-move_data_magieraum:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
+move_data_magieraum:		.byte	228,                	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
 move_data_katapult:		.byte	MOVE_EFFECT_NONE,	50,		5,		100,		15,		0,		0,		0,		50,		0,		0,		0
 move_data_bergsturm:		.byte	MOVE_EFFECT_NONE,	60,		1,		100,		10,		0,		0,		0,		51,		0,		0,		0
 move_data_funkenflug:		.byte	MOVE_EFFECT_NONE,	70,		10,		100,		15,		0,		8,		0,		50,		0,		1,		0

data/pkmn_tables/pokemon_moveset_table.S

@@ -1218,9 +1218,9 @@ moveset_bisasam:
 .byte 0x1 
 .hword MOVE_HOWL 
 .byte 0x3 
-.hword MOVE_MAGNET_RISE
+.hword MOVE_LUNAR_DANCE
 .byte 0x7 
-.hword MOVE_HYPNOSIS
+.hword MOVE_WONDER_ROOM
 .byte 0x7
 .hword 0x4D 
 .byte 0xD 

nbproject/configurations.xml

@@ -4627,6 +4627,7 @@
           <in>debug.h</in>
           <in>item_effects.h</in>
           <in>items.h</in>
+          <in>pkmn_attributes.h</in>
           <in>pokemon.h</in>
         </df>
         <df name="interface">
@@ -4674,6 +4675,10 @@
             <in>crush_grip_like_script.S</in>
             <in>hp_damage_mod.c</in>
           </df>
+          <df name="defog">
+            <in>defog.c</in>
+            <in>defog_script.S</in>
+          </df>
           <df name="fang_moves">
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>
@@ -4692,6 +4697,10 @@
           <df name="hazards">
             <in>hazards_scripts.S</in>
           </df>
+          <df name="healing_wish">
+            <in>healing_wish.c</in>
+            <in>healing_wish_script.S</in>
+          </df>
           <df name="lucky_chant">
             <in>lucky_chant.c</in>
             <in>lucky_chant_script.S</in>
@@ -4716,6 +4725,10 @@
             <in>punishment.c</in>
             <in>punishment_script.S</in>
           </df>
+          <df name="rooms">
+            <in>rooms.c</in>
+            <in>rooms_script.S</in>
+          </df>
           <df name="roost">
             <in>roost.c</in>
             <in>roost_scripts.S</in>
@@ -27341,6 +27354,8 @@
       </item>
       <item path="src/include/items.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="src/include/pkmn_attributes.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/include/pokemon.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/interface/lcd_io_test.S" ex="false" tool="4" flavor2="0">
@@ -27437,6 +27452,10 @@
             tool="0"
             flavor2="0">
       </item>
+      <item path="src/moves/defog/defog.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/defog/defog_script.S" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="src/moves/fang_moves/fang_animations.S"
             ex="false"
             tool="4"
@@ -27468,6 +27487,16 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/healing_wish/healing_wish.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="src/moves/healing_wish/healing_wish_script.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/moves/lucky_chant/lucky_chant.c"
             ex="false"
             tool="0"
@@ -27522,6 +27551,10 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="src/moves/rooms/rooms.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/moves/rooms/rooms_script.S" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="src/moves/roost/roost.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="src/moves/roost/roost_scripts.S" ex="false" tool="4" flavor2="0">

nbproject/private/configurations.xml

@@ -4059,6 +4059,8 @@
             </df>
             <df name="crush_grip_like">
             </df>
+            <df name="defog">
+            </df>
             <df name="fang_moves">
             </df>
             <df name="feint">
@@ -4069,6 +4071,8 @@
             </df>
             <df name="hazards">
             </df>
+            <df name="healing_wish">
+            </df>
             <df name="lucky_chant">
             </df>
             <df name="magnet_rise">
@@ -4081,6 +4085,8 @@
             </df>
             <df name="punishment">
             </df>
+            <df name="rooms">
+            </df>
             <df name="roost">
             </df>
             <df name="swap_moves">
@@ -5797,6 +5803,7 @@
           <in>lcd.h</in>
           <in>moves.h</in>
           <in>objects.h</in>
+          <in>pkmn_attributes.h</in>
           <in>pkmn_types.h</in>
           <in>pokemon.h</in>
           <in>sound.h</in>
@@ -5847,6 +5854,10 @@
             <in>crush_grip_like_script.S</in>
             <in>hp_damage_mod.c</in>
           </df>
+          <df name="defog">
+            <in>defog.c</in>
+            <in>defog_script.S</in>
+          </df>
           <df name="fang_moves">
             <in>fang_animations.S</in>
             <in>fang_effect.S</in>
@@ -5865,6 +5876,10 @@
           <df name="hazards">
             <in>hazards_scripts.S</in>
           </df>
+          <df name="healing_wish">
+            <in>healing_wish.c</in>
+            <in>healing_wish_script.S</in>
+          </df>
           <df name="lucky_chant">
             <in>lucky_chant.c</in>
             <in>lucky_chant_script.S</in>
@@ -5889,6 +5904,10 @@
             <in>punishment.c</in>
             <in>punishment_script.S</in>
           </df>
+          <df name="rooms">
+            <in>rooms.c</in>
+            <in>rooms_script.S</in>
+          </df>
           <df name="roost">
             <in>roost.c</in>
             <in>roost_scripts.S</in>

src/battle_engine/battle_help.c

@@ -119,4 +119,20 @@ u8 cant_poison(u8 bank, u8 self_inflicted) { //0 == can poison
     if (side_affecting_halfword[get_side_from_bank(bank)].safeguard_on && !self_inflicted)
         return 5;
     return 0;
+}
+
+u8 count_party_pokemon(u8 bank)
+{
+    struct pokemon* poke;
+    if (get_side_from_bank(bank))
+        poke = &party_opponent[0];
+    else
+        poke = &party_player[0];
+    u8 usable_pokes = 0;
+    for (u8 i = 0; i < 6; i ++)
+    {
+        if (get_attributes(&poke[i], ATTR_CURRENT_HP, 0) != 0 && get_attributes(&poke[i], ATTR_IS_EGG, 0) != 1 && get_attributes(&poke[i], ATTR_SPECIES, 0) != 0)
+            usable_pokes++;
+    }
+    return usable_pokes;
 }

src/battle_engine/custom_structs_malloc.c

@@ -44,6 +44,7 @@ void battle_switch_in()
             *def = switch_var;
         }
     }
+    
     struct side_affecting* active_side = &custom_battle_elements.ptr->side_affecting[get_side_from_bank(battle_active_bank)];
     active_side->stealth_rock_done = 0;
     active_side->sticky_web_done = 0;

src/battle_engine/entry_hazards.c

@@ -12,11 +12,27 @@ extern void* bs_rocks_lain;
 extern void* bs_toxic_lain;
 extern void* bs_sticky_lain;
 
+extern void* bs_lunar_dance_exec;
+
+extern void* str_lunardance_executed_ref;
+
 u8 execute_entry_hazards() {
     u8 active_side = get_side_from_bank(battle_active_bank);
     u8 has_effect = 0;
     struct side_affecting* active_side_affecting = &custom_battle_elements.ptr->side_affecting[active_side];
-    if (side_affecting_halfword[active_side].spikes_on && !(side_affecting_halfword[active_side].spikes_damage_done)) {
+    if (active_side_affecting->lunardance && !(active_side_affecting->lunardance_done)) {
+        battle_damage_store = ((s32)battle_participants[battle_active_bank].max_hp - (s32)battle_participants[battle_active_bank].current_hp) * -1;
+        active_side_affecting->lunardance = 0;
+        
+        battle_participants[battle_active_bank].status.int_status = 0;
+        prepare_setattributes_in_battle(0, REQUEST_STATUS_BATTLE, 0, 4, &battle_participants[battle_active_bank].status);
+        mark_buffer_bank_for_execution(battle_active_bank);
+        
+        battle_script_push();
+        battle_string_chooser = str_lunardance_executed_ref;
+        battlescript_cursor = bs_lunar_dance_exec;
+        has_effect = 1;
+    } else if (side_affecting_halfword[active_side].spikes_on && !(side_affecting_halfword[active_side].spikes_damage_done)) {
         //spikes lay down, deal spiky damage
         u32 damage = (battle_participants[battle_active_bank].max_hp) / ((5 - battle_side_timers[active_side].spikes_amount) * 2);
         if (damage == 0)
@@ -68,8 +84,7 @@ u8 execute_entry_hazards() {
                 battle_participants[battle_active_bank].status.flags.toxic_poison = 1;
                 battle_script_push();
                 battlescript_cursor = bs_toxic_spikes_bad;
-            }
-            else {
+            } else {
                 battle_participants[battle_active_bank].status.flags.poison = 1;
                 battle_script_push();
                 battlescript_cursor = bs_toxic_spikes;

src/include/battle_help.h

@@ -9,4 +9,5 @@ u16 apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_bank, u
 u16 type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank, u8 effects_handling_and_recording);
 u8 has_type(u8 bank, u8 type);
 u8 cant_poison(u8 bank, u8 self_inflicted);
+u8 count_party_pokemon(u8 bank);
 #endif

src/include/battle_locations.h

@@ -9,7 +9,7 @@ u16 battle_executed_move;
 u8 battle_attacker_bank;
 u8 battle_defender_bank;
 u8 battle_damage_multiplier;
-u16 battle_damage_store;
+s32 battle_damage_store;
 u32 battle_hitmarker;
 void* battlescript_cursor;
 u8 battle_menu_chosen_item[4];

src/include/battle_script.h

@@ -173,11 +173,11 @@
 .word \jumpifstatus_address
 .endm
 
-.macro jumpifsecondarytstatus jumpifsecondarytstatus_bank jumpifsecondarytstatus_status jumpifsecondarytstatus_address
+.macro jumpifsecondarystatus jumpifsecondarystatus_bank jumpifsecondarystatus_status jumpifsecondarystatus_address
 .byte 0x1D
-.byte \jumpifsecondarytstatus_bank
-.word \jumpifsecondarytstatus_status
-.word \jumpifsecondarytstatus_address
+.byte \jumpifsecondarystatus_bank
+.word \jumpifsecondarystatus_status
+.word \jumpifsecondarystatus_address
 .endm
 
 .macro jumpifability jumpifability_bank jumpifability_ability jumpifability_address

src/include/battle_structs.h

@@ -104,6 +104,31 @@ struct iv_set
     u32 iv_sp_def: 5;
 };
 
+struct pokemon{
+	u32 PID;
+	u32 OTID;
+	char name[10];
+	u16 language;
+	u8 OT_name[7];
+	u8 markings;
+	u16 checksum;
+	u16 padding_maybe;
+	u8 data[48];
+	u32 ailment;
+	u8 level;
+	u8 pokerus;
+	u16 current_hp;
+	u16 total_hp;
+	u16 attack;
+	u16 defense;
+	u16 speed;
+	u16 sp_attack;
+	u16 sp_defense;
+};
+
+extern struct pokemon party_opponent[6];
+extern struct pokemon party_player[6];
+
 struct battle_participant {
     u16 poke_species;
     u16 atk;

src/include/bpre.h

@@ -7,6 +7,7 @@
 #include "lcd.h"
 #include <callback.h>
 #include <config.h>
+#include <pkmn_attributes.h>
 
 u32 __aeabi_uidivmod(u32 a, u32 b);
 u16 *var_access(int index);
@@ -39,4 +40,8 @@ void obj_sync();
 //task related stuff
 void task_exec();
 
+//attribute setter and getter
+u8 get_attributes(struct pokemon* poke_address, u8 request, void* destination);
+void set_attributes(struct pokemon* poke_address, u8 request, void* new_value);
+
 #endif

src/include/pkmn_attributes.h

@@ -0,0 +1,62 @@
+#ifndef PKMN_ATTRIBUTES_H
+#define PKMN_ATTRIBUTES_H
+
+#define ATTR_PID 0x0
+#define ATTR_TID 0x1
+#define ATTR_NAME 0x2
+#define ATTR_FONT_LANG 0x3
+#define ATTR_SANITY 0x4
+#define ATTR_OT_NAME 0x7
+#define ATTR_MARKS 0x8
+#define ATTR_CHECKSUM 0x9
+#define ATTR_SPECIES 0xB
+#define ATTR_HELD_ITEM 0xC
+#define ATTR_ATTACK_1 0xD
+#define ATTR_ATTACK_2 0xE
+#define ATTR_ATTACK_3 0xF
+#define ATTR_ATTACK_4 0x10
+#define ATTR_PP_1 0x11
+#define ATTR_PP_2 0x12
+#define ATTR_PP_3 0x13
+#define ATTR_PP_4 0x14
+#define ATTR_PP_BONUS 0x15
+#define ATTR_COOLNESS 0x16
+#define ATTR_BEAUTY 0x17
+#define ATTR_CUTENESS 0x18
+#define ATTR_EXP 0x19
+#define ATTR_HP_EV 0x1A
+#define ATTR_ATTACK_EV 0x1B
+#define ATTR_DEFENCE_EV 0x1C
+#define ATTR_SPEED_EV 0x1D
+#define ATTR_SP_ATTACK_EV 0x1E
+#define ATTR_SP_DEFENCE_EV 0x1F
+#define ATTR_HAPPINESS 0x20
+#define ATTR_SMARTNESS 0x21
+#define ATTR_POKERUS 0x22
+#define ATTR_CATCH_LOCATION 0x23
+#define ATTR_CATCH_LVL 0x24
+#define ATTR_HP_IV 0x27
+#define ATTR_ATTACK_IV 0x28
+#define ATTR_DEFENCE_IV 0x29
+#define ATTR_SPEED_IV 0x2A
+#define ATTR_SPECIAL_ATTACK_IV 0x2B
+#define ATTR_SPECIAL_DEFENCE_IV 0x2C
+#define ATTR_IS_EGG 0x2D
+#define ATTR_ABILITY_BIT 0x2E
+#define ATTR_TOUGHNESS 0x2F
+#define ATTR_SHEEN 0x30
+#define ATTR_STATUS_AILMENT 0x37
+#define ATTR_LEVEL 0x38
+#define ATTR_CURRENT_HP 0x39
+#define ATTR_TOTAL_HP 0x3A
+#define ATTR_ATTACK 0x3B
+#define ATTR_DEFENCE 0x3C
+#define ATTR_SPEED 0x3D
+#define ATTR_SPECIAL_ATTACK 0x3E
+#define ATTR_SPECIAL_DEFENCE 0x3F
+#define ATTR_SPECIES_2 0x41
+
+
+
+#endif /* PKMN_ATTRIBUTES_H */
+

src/moves/defog/defog.c

@@ -0,0 +1,40 @@
+#include <battle.h>
+
+u8 defog_field()
+{
+    u8 side_defender = get_side_from_bank(battle_defender_bank);
+    u8 side_attacker = get_side_from_bank(battle_attacker_bank);
+    
+    side_affecting_halfword[side_defender].light_screen_on = false;
+    side_affecting_halfword[side_defender].reflect_on = false;
+    side_affecting_halfword[side_defender].mist_on = false;
+    side_affecting_halfword[side_defender].spikes_on = false;
+    side_affecting_halfword[side_defender].safeguard_on = false;
+    
+    side_affecting_halfword[side_attacker].safeguard_on = false;
+    side_affecting_halfword[side_attacker].mist_on = false;
+    side_affecting_halfword[side_attacker].spikes_on = false;
+    
+    battle_side_timers[side_defender].lightscreen_timer = 0;
+    battle_side_timers[side_defender].reflect_timer = 0;
+    
+    battle_side_timers[side_defender].mist_timer = 0;
+    battle_side_timers[side_defender].safeguard_timer = 0;
+    battle_side_timers[side_defender].spikes_amount = 0;
+    
+    battle_side_timers[side_attacker].mist_timer = 0;
+    battle_side_timers[side_attacker].safeguard_timer = 0;
+    battle_side_timers[side_attacker].spikes_amount = 0;
+    
+    custom_battle_elements.ptr->side_affecting[side_attacker].stealth_rock = false;
+    custom_battle_elements.ptr->side_affecting[side_attacker].sticky_web = false;
+    custom_battle_elements.ptr->side_affecting[side_attacker].toxic_spikes_psn = false;
+    custom_battle_elements.ptr->side_affecting[side_attacker].toxic_spikes_badpsn = false;
+    
+    custom_battle_elements.ptr->side_affecting[side_defender].stealth_rock = false;
+    custom_battle_elements.ptr->side_affecting[side_defender].sticky_web = false;
+    custom_battle_elements.ptr->side_affecting[side_defender].toxic_spikes_psn = false;
+    custom_battle_elements.ptr->side_affecting[side_defender].toxic_spikes_badpsn = false;
+    
+    return false;
+}

src/moves/defog/defog_script.S

@@ -0,0 +1,25 @@
+#include <battle_script.h>
+#include <moves.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_defog
+bs_defog:
+    setbyte 0x2023FDE 0x97
+    attackcanceler
+    jumpifsecondarystatus 0x0 0x1000000 0x81D7DF0
+    accuracycheck 0x81D695E 0x0
+    attackstring
+    ppreduce
+    jumpifhalfword 0x0 0x2023D4A MOVE_SWEET_SCENT no_defog
+    callasm defog_field+1
+no_defog:
+    statbuffchange 0x1 0x81D6C5D
+    jumpifbyte 0x3 0x2023E87 0x2 0x81D6C4B
+    jumpifbyte 0x0 0x2023E87 0x3 0x81D6C5D
+    pause 0x20
+    goto 0x81D6C55
+
+

src/moves/healing_wish/healing_wish.c

@@ -0,0 +1,17 @@
+#include <battle.h>
+#include <battle_help.h>
+
+u8 set_healing_wish() {
+    if (count_party_pokemon(battle_attacker_bank) <= 1) {
+        //it will fail
+        battlescript_cursor = (void*) (0x081D7DF0);
+        return true;
+    } else {
+        u8 user_side = get_side_from_bank(battle_attacker_bank);
+        custom_battle_elements.ptr->side_affecting[user_side].lunardance = true;
+        battle_damage_store = battle_participants[battle_attacker_bank].current_hp;
+        battle_hitmarker |= 0x100; //No substitute, only glory in death!
+        return false;
+    }
+    return false;
+}

src/moves/healing_wish/healing_wish_script.S

@@ -0,0 +1,48 @@
+#include <battle_script.h>
+
+.align 2
+.thumb
+.text
+
+.global bs_healing_wish
+bs_healing_wish:
+
+    attackcanceler
+    attackstring
+    ppreduce
+    callasm set_healing_wish+1
+    attackanimation
+    waitanimation
+    graphicalhpupdate 1
+    datahpupdate 1
+    faintpokemon 1 0 0
+    setbyte 0x2023FD8 0x0
+    cmd49 0x0 0x0
+    end
+
+bs_lunar_dance_exec_int:
+    orword 0x2023DD0 0x100100    
+    graphicalhpupdate 1
+    datahpupdate 1
+    printstring 0x184
+    waitmessage 0x40
+    cmd98 0x0
+    setbyte 0x02023FD8 0
+    cmd49 0 0
+    return
+
+.align 2
+.global bs_lunar_dance_exec
+bs_lunar_dance_exec:
+    .word bs_lunar_dance_exec_int
+
+.global as_lunar_dance
+as_lunar_dance:
+    .byte 0x00, 0xD2, 0x27, 0x00, 0xD3, 0x27, 0x00, 0x2F, 0x27, 0x0C, 0x00, 0x10, 0x02, 0x24, 0x7B, 0x3E, 0x08, 0x02, 0x05, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x05, 0x02, 0x34
+    .byte 0x37, 0x3E, 0x08, 0x02, 0x02, 0x78, 0x00, 0x38, 0x00, 0x03, 0x49, 0x60, 0x07, 0x08, 0x03, 0x05, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0xCC, 0x00, 0x00, 0x04, 0x1E
+    .byte 0x02, 0x64, 0x37, 0x3E, 0x08, 0x28, 0x02, 0xF4, 0xFF, 0x00, 0x00, 0x04, 0x1E, 0x02, 0x64, 0x37, 0x3E, 0x08, 0x28, 0x02, 0xE8, 0xFF, 0x00, 0x00, 0x04, 0x1E, 0x02, 0x64, 0x37, 0x3E, 0x08, 0x28
+    .byte 0x02, 0x15, 0x00, 0x00, 0x00, 0x04, 0x1E, 0x02, 0x64, 0x37, 0x3E, 0x08, 0x28, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1E, 0x02, 0x64, 0x37, 0x3E, 0x08, 0x28, 0x02, 0x0A, 0x00, 0x00, 0x00, 0x04
+    .byte 0x14, 0x03, 0xC1, 0x5F, 0x0A, 0x08, 0x02, 0x00, 0x05, 0x0A, 0x02, 0x0C, 0x0C, 0x08, 0x03, 0x7D, 0x90, 0x09, 0x08, 0x02, 0x05, 0x00, 0x00, 0x18, 0x00, 0x06, 0x00, 0x04, 0x00, 0x04, 0x00, 0x03
+    .byte 0x99, 0xAB, 0x0B, 0x08, 0x02, 0x04, 0x00, 0x00, 0x04, 0x00, 0x07, 0x00, 0x0A, 0x00, 0x19, 0x80, 0x00, 0xC0, 0x04, 0x0C, 0x19, 0x80, 0x00, 0xC0, 0x04, 0x0C, 0x19, 0x80, 0x00, 0xC0, 0x04, 0x0C
+    .byte 0x19, 0x80, 0x00, 0xC0, 0x04, 0x0C, 0x19, 0x80, 0x00, 0xC0, 0x04, 0x0C, 0x05, 0x0B, 0x02, 0x0D, 0x04, 0x01, 0x08
+

src/moves/punishment/punishment.c

@@ -9,7 +9,8 @@ u8 punishment_damage_mod() {
             (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);
+            (defender->evasion_buff > 6 ? defender->evasion_buff - 6 : 0) +
+            (defender->acc_buff > 6 ? defender->acc_buff - 6 : 0);
 
     battle_base_power = 60 + (status_count * 20);
     if (battle_base_power > 200)

src/moves/rooms/rooms.c

@@ -0,0 +1,42 @@
+#include <battle.h>
+
+extern void* str_trick_room_off_ref;
+extern void* str_trick_room_on_ref;
+extern void* str_magic_room_off_ref;
+extern void* str_magic_room_on_ref;
+extern void* str_wonder_room_off_ref;
+extern void* str_wonder_room_on_ref;
+
+u8 set_or_delete_rooms() {
+    struct field_affecting* field = &custom_battle_elements.ptr->field_affecting;
+    switch (battle_executed_move) {
+        case MOVE_TRICK_ROOM:
+            if (field->trick_room) {
+                field->trick_room = 0;
+                battle_string_chooser = str_trick_room_off_ref;
+            } else {
+                field->trick_room = 5;
+                battle_string_chooser = str_trick_room_on_ref;
+            }
+            break;
+        case MOVE_MAGIC_ROOM:
+            if (field->magic_room) {
+                field->magic_room = 0;
+                battle_string_chooser = str_magic_room_off_ref;
+            } else {
+                field->magic_room = 5;
+                battle_string_chooser = str_magic_room_on_ref;
+            }
+            break;
+        case MOVE_WONDER_ROOM:
+            if (field->wonder_room) {
+                field->wonder_room = 0;
+                battle_string_chooser = str_wonder_room_off_ref;
+            } else {
+                field->wonder_room = 5;
+                battle_string_chooser = str_wonder_room_on_ref;
+            }
+            break;
+    }
+    return false;
+}

src/moves/rooms/rooms_script.S

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

src/moves/swap_moves/swap_moves.c

@@ -56,6 +56,10 @@ u8 set_swap_moves() {
             attacker->sp_atk_buff = defender->sp_atk_buff;
             defender->sp_atk_buff = swap;
             battle_string_chooser = str_heart_swap_ref;
+            
+            swap = attacker->acc_buff;
+            attacker->acc_buff = defender->acc_buff;
+            defender->acc_buff = swap;
             break;
     }
     return false;

string/de/move_strings.txt

@@ -8,4 +8,11 @@ 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_worry_seed=\hFD\h10 nimmt die Fähigkeit\nInsomnia an!
-str_magnet_rise=\hFD\h0F schwebt aufgrund von\nElektromagnetismus!
+str_magnet_rise=\hFD\h0F schwebt aufgrund von\nElektromagnetismus!
+str_trick_room_on=\hFD\h0F hat die Dimensionen\nverdreht!
+str_trick_room_off=Die Dimensionen sind wieder\nnormal!
+str_magic_room_on=Es entsteht ein Raum in dem\ngetragene Items ihre Wirkung verlieren!
+str_magic_room_off=Der Magieraum verschwindet!
+str_wonder_room_on=Es entsteht ein Raum in dem Verteidigung\nund Spezialverteidigung getauscht sind.
+str_wonder_room_off=Der Wunderraum verschwindet!
+str_lunardance_executed=Das Opfer erreicht \hFD\h13!