entry hazards finished (toxic, sticky, stealth, spikes)

bpre.sym

@@ -57,6 +57,8 @@ clear_flag = 0x0806E6A9;
 divide = 0x081E4018;
 
 get_side_from_bank = 0x080751C4|1;
+prepare_setattributes_in_battle = 0x0800DFF0|1;
+mark_buffer_bank_for_execution = 0x8017248|1;
 
 decompression_buffer = 0x0201C000;
 superstate = 0x030030F0;
@@ -85,8 +87,11 @@ battle_base_power = 0x02024020;
 battle_side_unknown = 0x02023FDB;
 battle_side_timers = 0x02023DE4;
 battle_hitmarker = 0x02023dd0;
+battle_stat_changer = 0x02023FDE;
 side_affecting_halfword = 0x2023DDE;
 
+battle_custom_string = 0x0203C020;
+
 battle_status3_bits_pbs = 0x02023DFC;
 
 mugshots = 0x097007E0;

data/moves/effect_table.S

@@ -116,7 +116,7 @@ m_effect_table:
 	.word 0x081D774D @109
 	.word 0x081D6900 @110
 	.word 0x081D7816 @111
-	.word 0x081D7829 @112
+	.word hazards_script @112 (Spikes, Toxic Spikes, Stealth Rock, Sticky Web)
 	.word 0x081D783E @113
 	.word 0x081D7856 @114
 	.word 0x081D7897 @115

data/pkmn_tables/pokemon_moveset_table.S

@@ -1,6 +1,7 @@
+#include <moves.h>
+
 .text
 .align 2
-.text
 .global moveset_table
 moveset_table:
 
@@ -1213,11 +1214,11 @@ moveset_unknown:
 
 .align 2
 moveset_bisasam: 
-.hword 0x21 
+.hword MOVE_TACKLE
 .byte 0x1 
 .hword 0x2D 
 .byte 0x3 
-.hword 0x49 
+.hword MOVE_SPIKES 
 .byte 0x7 
 .hword 0x16 
 .byte 0x9 

data/pkmn_tables/pokemon_stats.S

@@ -7,7 +7,7 @@ pokemon_stats:
 .hword 0, 0 
 .byte 255, 20, 100, 4, 15, 15, 0, 0, 0, 8, 0, 0
  
-.byte 45, 49, 49, 45, 65, 65, 2, 10, 45, 64, 0, 1 
+.byte 45, 49, 49, 45, 65, 65, 12, 3, 45, 64, 0, 1 
 .hword 0, 0 
 .byte 31, 20, 70, 3, 1, 7, 65, 34, 0, 3, 0, 0
  

src/battle_engine/battle_help.c

@@ -92,4 +92,30 @@ u16 type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank, u8
 	//TODO: save into structs
 	//TODO: effect_handling_and_recoring
 	return chained_effect;
+}
+
+u8 has_type(u8 bank, u8 type)
+{
+	return battle_participants[bank].type1 == type || battle_participants[bank].type2 == type;
+}
+
+u8 cant_poison(u8 bank, u8 self_inflicted)
+{   //0 == can poison
+    //1 == is already poisoned
+    //2 == has other major condition
+    //3 == type doesn't allow it
+    //4 == ability doesn't allow it
+    //5 == safeguard protection
+    //8 == misty terrain doesn't allow it !TODO!
+    if (battle_participants[bank].status.flags.poison || battle_participants[bank].status.flags.toxic_poison)
+        return 1;
+    if (battle_participants[bank].status.int_status)
+        return 2;
+    if (has_type(bank, TYPE_POISON) || has_type(bank, TYPE_STEEL))
+        return 3;
+    if (((battle_participants[bank].ability_id == ABILITY_IMMUNITY || (battle_participants[bank].ability_id == ABILITY_LEAF_GUARD && (battle_weather.flags.sun || battle_weather.flags.permament_sun || battle_weather.flags.harsh_sun)))))
+        return 4;
+    if (side_affecting_halfword[get_side_from_bank(bank)].safeguard_on && !self_inflicted)
+        return 5;
+    return 0;
 }

src/battle_engine/battle_help.h

@@ -6,4 +6,6 @@
 u16 damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 atk_bank, u8 def_bank, u16 chained_effect, u8 airstatus);
 u16 apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_bank, u8 atk_bank, u8 airstatus);
 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);
 #endif

src/battle_engine/entry_hazards.c

@@ -2,18 +2,21 @@
 #include <bpre.h>
 
 extern void* bs_stealth_rock;
+extern void* bs_toxic_spikes;
+extern void* bs_toxic_spikes_bad;
+extern void* bs_sticky_web;
+extern void* bs_toxic_resolve;
+
+extern void* bs_spikes_lain;
+extern void* bs_rocks_lain;
+extern void* bs_toxic_lain;
+extern void* bs_sticky_lain;
 
 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_struct.ptr->side_affecting[active_side];
-	//Debug
-	//side_affecting_halfword[active_side].spikes_on=1;
-	//battle_side_timers[active_side].spikes_amount=4;
-	active_side_affecting->stealth_rock=1;
-	//side_affecting_halfword[active_side].spikes_damage_done=0;
-	
 	if(side_affecting_halfword[active_side].spikes_on && !(side_affecting_halfword[active_side].spikes_damage_done))
 	{
 		//spikes lay down, deal spiky damage
@@ -55,10 +58,48 @@ u8 execute_entry_hazards()
 		battle_damage_store = damage;
 		
 		battle_script_push();
-		//spikes for now
 		battlescript_cursor = bs_stealth_rock;
 		has_effect = 1;
 	}
+	else if(active_side_affecting->toxic_spikes_psn && !(active_side_affecting->toxic_spikes_done))
+	{
+		active_side_affecting->toxic_spikes_done=1;
+		if(has_type(battle_active_bank, TYPE_POISON))
+		{
+			has_effect = 1;
+			active_side_affecting->toxic_spikes_psn=0;
+			active_side_affecting->toxic_spikes_badpsn=0;
+			battle_script_push();
+			battlescript_cursor = bs_toxic_resolve;
+		}
+		else if(!cant_poison(battle_active_bank, 0))
+		{
+			if (active_side_affecting->toxic_spikes_badpsn)
+			{
+				battle_participants[battle_active_bank].status.flags.toxic_poison = 1;
+				battle_script_push();
+				battlescript_cursor = bs_toxic_spikes_bad;
+			}
+                
+            else
+			{
+				battle_participants[battle_active_bank].status.flags.poison = 1;
+				battle_script_push();
+				battlescript_cursor = bs_toxic_spikes;
+			}
+            prepare_setattributes_in_battle(0, REQUEST_STATUS_BATTLE, 0, 4, &battle_participants[battle_active_bank].status.flags);
+            mark_buffer_bank_for_execution(battle_active_bank);
+			has_effect = 1;
+		}
+	}
+	else if(active_side_affecting->sticky_web && !(active_side_affecting->sticky_web_done) && battle_participants[battle_active_bank].spd_buff != 0)
+	{
+		active_side_affecting->sticky_web_done=1;
+        battle_script_push();
+        battlescript_cursor = bs_sticky_web;
+        battle_stat_changer = 0x93;
+        has_effect = 1;
+	}
 	
 	if (has_effect)
     {
@@ -67,4 +108,67 @@ u8 execute_entry_hazards()
        battle_hitmarker &= 0xFFFFFFBF;
     }
 	return has_effect;
+}
+
+u8 lay_entry_hazards()
+{
+	u8 target_side = get_side_from_bank(battle_defender_bank);
+	u8 fail=0;
+	struct side_affecting* target_side_struct = &custom_battle_struct.ptr->side_affecting[target_side];
+	switch(battle_executed_move)
+	{
+		case MOVE_SPIKES:
+			if(battle_side_timers[target_side].spikes_amount < 3)
+			{
+				battle_side_timers[target_side].spikes_amount++;
+				side_affecting_halfword[target_side].spikes_on = 1;
+				battlescript_cursor = bs_spikes_lain;
+			}
+			else
+			{
+				fail = 1;
+			}
+			break;
+		case MOVE_STEALTH_ROCK:
+			if(target_side_struct->stealth_rock==0)
+			{	
+				target_side_struct->stealth_rock=1;
+				battlescript_cursor = bs_rocks_lain;
+			}
+			else
+				fail=1;
+			break;
+		case MOVE_TOXIC_SPIKES:
+			if(target_side_struct->toxic_spikes_psn==0)
+			{
+				target_side_struct->toxic_spikes_psn=1;
+				battlescript_cursor = bs_toxic_lain;
+			}
+			else if(target_side_struct->toxic_spikes_badpsn==0)
+			{
+				target_side_struct->toxic_spikes_badpsn=1;
+				battlescript_cursor = bs_toxic_lain;
+			}
+			else
+				fail=1;
+			break;
+		case MOVE_STICKY_WEB:
+			if(target_side_struct->sticky_web==0)
+			{
+				target_side_struct->sticky_web=1;
+				battlescript_cursor = bs_sticky_lain;
+			}
+			else
+				fail=1;
+			break;
+		default:
+			fail=1;
+			break;
+	}
+	if(fail)
+	{
+		//failed execution
+		battlescript_cursor = (void*) (0x081D7DF0);
+	}
+	return 1;
 }

src/battle_engine/scripts/hazards.S

@@ -6,18 +6,79 @@
 
 .global bs_stealth_rock_int
 bs_stealth_rock_int:
-
-orword 0x2023DD0 0x100100
-graphicalhpupdate 0x0
-datahpupdate 0x0
-setword 0x0203C020 str_stealth_rock
-printstring 0x184
-waitmessage 0x40
-faintpokemon 0x0 0x0 0x0
-faintpokemon 0x0 0x1 0x81D8CDF
-return
+	orword 0x2023DD0 0x100100
+	graphicalhpupdate 0x0
+	datahpupdate 0x0
+	setword STRING_LOADER str_stealth_rock
+	printstring 0x184
+	waitmessage 0x40
+	faintpokemon 0x0 0x0 0x0
+	faintpokemon 0x0 0x1 0x81D8CDF
+	return
 
 .align 2
 .global bs_stealth_rock
 bs_stealth_rock:
-.word bs_stealth_rock_int
+	.word bs_stealth_rock_int
+
+
+.global toxic_spikes_int
+toxic_spikes_int:
+	statusanimation BANK_TARGET
+	setword STRING_LOADER str_got_poison
+rest_of_toxic:
+	printstring 0x184
+	waitmessage 0x40
+	cmd98 0x0
+	setbyte 0x2023FD8 0x0
+	cmd49 0x0 0x0
+	return
+
+.align 2
+.global bs_toxic_spikes
+bs_toxic_spikes:
+	.word toxic_spikes_int
+
+.align 2
+.global bs_toxic_spikes_bad_int
+bs_toxic_spikes_bad_int:
+	statusanimation BANK_TARGET
+	setword STRING_LOADER str_got_bad_poison
+	goto rest_of_toxic
+
+.align 2
+.global bs_toxic_spikes_bad
+bs_toxic_spikes_bad:
+	.word bs_toxic_spikes_bad_int
+	
+.align 2
+.global bs_sticky_web_int
+bs_sticky_web_int:
+	setword STRING_LOADER str_sticky_web
+	printstring 0x184
+	waitmessage 0x40
+	statbuffchange 0x1 sticky_return
+	cmd47
+	playanimation 0 1 0x02023FD4
+	printfromtable 0x083FE57C
+	waitmessage 0x40
+sticky_return:
+	return
+	
+.align 2
+.global bs_sticky_web
+bs_sticky_web:
+	.word bs_sticky_web_int
+	
+.align 2
+.global bs_toxic_resolve_int
+bs_toxic_resolve_int:
+	setword STRING_LOADER str_toxic_resolve
+	printstring 0x184
+	waitmessage 0x40
+	return
+	
+.align 2
+.global bs_toxic_resolve
+bs_toxic_resolve:
+	.word bs_toxic_resolve_int

src/include/battle.h

@@ -8,8 +8,14 @@
 #ifndef BATTLE_H_
 #define BATTLE_H_
 
+#define REQUEST_HELDITEM_BATTLE 0x2
+#define REQUEST_STATUS_BATTLE 0x28
+
 u8 get_side_from_bank(u8 bank);
 
+void mark_buffer_bank_for_execution(u8 bank);
+void prepare_setattributes_in_battle(u8 buffer, u8 data_request, u8 unkown, u8 data_to_add, void* ptr_to_attribute);
+
 void battle_script_push();
 
 #endif

src/include/battle_locations.h

@@ -2,6 +2,10 @@
 #define BATTLE_LOC_H_
 
 u8 battle_active_bank;
+u8 battle_stat_changer;
+u16 battle_executed_move;
+u8 battle_attacker_bank;
+u8 battle_defender_bank;
 u16 battle_damage_store;
 u32 battle_hitmarker;
 void* battlescript_cursor;

src/include/battle_script.h

@@ -9,6 +9,8 @@
 #define DELAY_HALFSECOND	0x20
 #define DELAY_1SECOND		0x40
 
+#define STRING_LOADER		0x0203C020
+
 @@ Compare operands
 .equ Equal, 0x0
 .equ Notequal, 0x1

src/include/battle_structs.h

@@ -127,4 +127,29 @@ struct side_timer{
 
 extern struct side_timer battle_side_timers[2];
 
+struct in_battle_weather{
+    u32 rain : 1;
+    u32 downpour : 1;
+    u32 permament_rain : 1;
+    u32 sandstorm : 1;
+    u32 permament_sandstorm : 1;
+    u32 sun : 1;
+    u32 permament_sun : 1;
+    u32 hail : 1;
+    //custom flags
+    u32 permament_hail : 1;
+    u32 fog : 1;
+    u32 permament_fog : 1;
+    u32 harsh_sun : 1;
+    u32 heavy_rain : 1;
+    u32 air_current : 1;
+};
+
+union battle_weather{
+    u32 int_bw;
+    struct in_battle_weather flags;
+};
+
+extern union battle_weather battle_weather;
+
 #endif

src/moves/battle_engine/cmd_callasm.S

@@ -18,10 +18,13 @@ orr r1, r2
 lsl r3, #0x18
 orr r1, r3
 bl bxr1
+cmp r0, #0
+bne no_script_change
 ldr r0, =0x02023D74
 ldr r1, [r0]
 add r1, #5
 str r1, [r0]
+no_script_change:
 pop {r0}
 bx r0
 

src/moves/hazards/hazards_scripts.S

@@ -0,0 +1,58 @@
+#include <battle_script.h>
+
+.text
+.align 2
+.thumb
+
+.global hazards_script
+hazards_script:
+attackcanceler
+callasm lay_entry_hazards
+
+.global bs_spikes_lain_int
+bs_spikes_lain_int:
+setword STRING_LOADER str_spikes_lain
+goto hazards_end
+
+.global bs_toxic_lain_int
+bs_toxic_lain_int:
+setword STRING_LOADER str_toxic_lain
+goto hazards_end
+
+.global bs_rocks_lain_int
+bs_rocks_lain_int:
+setword STRING_LOADER str_rocks_lain
+goto hazards_end
+
+.global bs_sticky_lain_int
+bs_sticky_lain_int:
+setword STRING_LOADER str_sticky_lain
+goto hazards_end
+
+.align 2
+.global bs_spikes_lain
+bs_spikes_lain:
+	.word bs_spikes_lain_int
+	
+.global bs_rocks_lain
+bs_rocks_lain:
+	.word bs_rocks_lain_int
+	
+.global bs_toxic_lain
+bs_toxic_lain:
+	.word bs_toxic_lain_int
+	
+.global bs_sticky_lain
+bs_sticky_lain:
+	.word bs_sticky_lain_int
+
+hazards_end:
+attackstring
+ppreduce
+attackanimation
+waitanimation
+printstring 0x184
+waitmessage 0x40
+setbyte 0x2023FD8 0x0
+cmd49 0x0 0x0
+end

string/de/hazards.txt

@@ -1 +1,9 @@
-str_stealth_rock=\hFD\h13 wurde von Tarnsteinen\nverletzt!
+str_stealth_rock=\hFD\h13 wurde von Tarnsteinen\nverletzt!
+str_got_poison=\hFD\h13 wurde vergiftet!
+str_got_bad_poison=\hFD\h13 wurde schwer vergiftet!
+str_sticky_web=\hFD\h13 wurde in einem Klebenetz\ngefangen!
+str_toxic_resolve=Giftspitzen wurden von \hFD\h13\nabsorbiert!
+str_spikes_lain=STACHELN AUSGELEGT TEXT (ENGLISCH)
+str_toxic_lain=GIFTSPITZEN AUSGELEGT TEXT (ENGLISCH)
+str_rocks_lain=TARNSTEINE AUSGELEGT TEXT (ENGLISCH)
+str_sticky_lain=KLEBENETZ AUSGELEGT TEXT (ENGLISCH)

string/en/hazards.txt

@@ -1 +1,5 @@
-str_stealth_rock=\hFD\h13 was hurt by\nStealth Rock
+str_stealth_rock=\hFD\h13 was hurt by\nStealth Rock
+str_got_poison=\hFD\h13 was poisoned!
+str_got_bad_poison=\hFD\h13 was badly poisoned!
+str_sticky_web=\hFD\h13 was caught in a\nSticky Web!
+str_toxic_resolve=Toxic Spikes were absorbed by\n\hFD\h13