finished entry hazards (switchin cleanup)

bpre.sym

@@ -1,8 +1,12 @@
+agbprintf = 0x081E39D8|1;
+agbprint_flush = 0x081E3B04|1;
+agb_assert = 0x081E3B14|1;
 set_callback2 = 0x08000545;
 vblank_handler_set = 0x080006F5;
 malloc = 0x08002BB0|1;
 free = 0x08002BC4|1;
 memset = 0x081E5ED8|1;
+memcpy = 0x081E5E78|1;
 template_instanciate_forward_search = 0x08006F8D;
 gpu_copy_to_vram_by_bgid = 0x08001298|1;
 bg_set_tilemap = 0x08001FA0|1;
@@ -96,7 +100,7 @@ battle_status3_bits_pbs = 0x02023DFC;
 
 mugshots = 0x097007E0;
 battle_bg_table = 0x0824ee34;
-custom_battle_struct = 0x0203FE00;
+custom_battle_elements = 0x0203FE00;
 
 
 mplay_table = 0x084A329C;

nbproject/configurations.xml

@@ -4594,6 +4594,7 @@
             <in>hazards.S</in>
           </df>
           <in>battle_help.c</in>
+          <in>battle_switch_in_hook.S</in>
           <in>custom_structs_malloc.c</in>
           <in>custom_structs_malloc_hook.S</in>
           <in>entry_hazards.c</in>
@@ -27132,6 +27133,11 @@
       </item>
       <item path="src/battle_engine/battle_help.c" ex="false" tool="0" flavor2="0">
       </item>
+      <item path="src/battle_engine/battle_switch_in_hook.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/battle_engine/custom_structs_malloc.c"
             ex="false"
             tool="0"

nbproject/private/configurations.xml

@@ -4733,6 +4733,7 @@
           </df>
           <in>battle_help.c</in>
           <in>battle_help.h</in>
+          <in>battle_switch_in_hook.S</in>
           <in>custom_structs_malloc.c</in>
           <in>custom_structs_malloc.h</in>
           <in>custom_structs_malloc_hook.S</in>
@@ -4864,10 +4865,18 @@
       <runprofile version="9">
         <runcommandpicklist>
           <runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
+          <runcommandpicklistitem>"./tools/vba buld/pkmn_sots.gba"</runcommandpicklistitem>
+          <runcommandpicklistitem>"./tools/vba" "build/pkmn_sots.gba"</runcommandpicklistitem>
+          <runcommandpicklistitem>"../tools/vba" "build/pkmn_sots.gba"</runcommandpicklistitem>
+          <runcommandpicklistitem>"../tools/vbam.exe --verbose=128" "build/pkmn_sots.gba"</runcommandpicklistitem>
+          <runcommandpicklistitem>"../tools/vbam.exe"  --verbose=128 "build/pkmn_sots.gba"</runcommandpicklistitem>
+          <runcommandpicklistitem>"../tools/vbam.exe" "build/pkmn_sots.gba" --agb-print --verbose=128</runcommandpicklistitem>
+          <runcommandpicklistitem>"../tools/vbam.exe" "build/pkmn_sots.gba"</runcommandpicklistitem>
+          <runcommandpicklistitem>"../tools/vba.exe" "build/pkmn_sots.gba"</runcommandpicklistitem>
         </runcommandpicklist>
-        <runcommand>"${OUTPUT_PATH}"</runcommand>
+        <runcommand>"../tools/vba.exe" "build/pkmn_sots.gba"</runcommand>
         <rundir>.</rundir>
-        <buildfirst>false</buildfirst>
+        <buildfirst>true</buildfirst>
         <terminal-type>0</terminal-type>
         <remove-instrumentation>0</remove-instrumentation>
         <environment>

patches/battle_engine/battle_engine.asm

@@ -1,4 +1,9 @@
 .org 0x08024E80
 ldr r0, =entry_hazards_hook|1
 bx r0
+.pool
+
+.org 0x08024FE4
+ldr r4, =battle_switch_in_hook|1
+bx r4
 .pool

src/battle_engine/battle_help.c

@@ -37,7 +37,7 @@ u16 damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 at
         dtype=dtype-5;
 	effect=type_effectiveness_table[atype][dtype];
 	
-	if (custom_battle_struct.ptr->various.inverse_battle)
+	if (custom_battle_elements.ptr->various.inverse_battle)
     {
         if (effect == 20)
         {

src/battle_engine/battle_switch_in_hook.S

@@ -0,0 +1,15 @@
+.text
+.align 2
+.thumb
+
+.global battle_switch_in_hook
+battle_switch_in_hook:
+    ldr r1, =0xFDFF
+    and r1, r2
+    strh r1, [r0]
+    mov r4, #0
+    push {r0-r3}
+    bl battle_switch_in
+    pop {r0-r3}
+    ldr r0, =0x08024FEC|1
+    bx r0

src/battle_engine/custom_structs_malloc.c

@@ -1,15 +1,55 @@
 #include <bpre.h>
+#include <battle.h>
 #include "custom_structs.h"
 #include "custom_structs_malloc.h"
 
 void malloc_battle_structs()
 {
-	custom_battle_struct.ptr=(struct custom_battle_struct*)malloc(sizeof(struct custom_battle_struct));
-	custom_battle_struct.ptr->side_affecting[0].sticky_web=1;
+	custom_battle_elements.ptr=(struct custom_battle_struct*)malloc(sizeof(struct custom_battle_struct));
+        custom_battle_elements.ptr->side_affecting[0].stealth_rock=1;
+        custom_battle_elements.ptr->side_affecting[0].toxic_spikes_psn=1;
+        custom_battle_elements.ptr->side_affecting[0].sticky_web=1;
 }
 
 void free_battle_structs()
 {
-	free(custom_battle_struct.ptr);
-	custom_battle_struct.ptr=0;
+	free(custom_battle_elements.ptr);
+	custom_battle_elements.ptr=0;
+}
+
+//hijack switch in command, clean up battle structs and carry over baton pass
+void battle_switch_in()
+{
+    struct bank_affecting* current_bank_affecting = &custom_battle_elements.ptr->bank_affecting[battle_active_bank];
+    //copy of the old structure to carry over baton pass effects
+    struct bank_affecting prev_bank_affecting = custom_battle_elements.ptr->bank_affecting[battle_active_bank];
+    memset(current_bank_affecting, 0, sizeof(struct bank_affecting));
+    //handle type 3 if needed
+    current_bank_affecting->just_switched_in = 1;
+    current_bank_affecting->wish_hp = prev_bank_affecting.wish_hp;
+    if(battle_executed_move == MOVE_BATON_PASS)
+    {
+        current_bank_affecting->aqua_ring = prev_bank_affecting.aqua_ring;
+        current_bank_affecting->embargo = prev_bank_affecting.embargo;
+        current_bank_affecting->powertrick = prev_bank_affecting.powertrick;
+        current_bank_affecting->gastro_acided = prev_bank_affecting.gastro_acided;
+        current_bank_affecting->heal_block = prev_bank_affecting.heal_block;
+        
+        if(prev_bank_affecting.powertrick)
+        {
+            //carry over switched stats of power trick
+            u16 *atk = &battle_participants[battle_active_bank].atk;
+            u16 *def = &battle_participants[battle_active_bank].def;
+            u16 switch_var = *atk;
+            *atk = *def;
+            *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;
+    active_side->toxic_spikes_done = 0;
+    active_side->lunardance_done = 0;
+    
+    return;
 }

src/battle_engine/custom_structs_malloc.h

@@ -3,5 +3,6 @@
 
 void malloc_battle_structs();
 void free_battle_structs();
+void battle_switch_in();
 
 #endif

src/battle_engine/entry_hazards.c

@@ -12,163 +12,133 @@ 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];
-	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);
+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)) {
+        //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)
             damage = 1;
         battle_damage_store = damage;
-		
-		side_affecting_halfword[active_side].spikes_damage_done = 1;
-		battle_script_push();
-		battlescript_cursor = (void*)(0x081D8CBE);
-		has_effect = 1;
-	}
-	else if(active_side_affecting->stealth_rock && !(active_side_affecting->stealth_rock_done))
-	{
-		active_side_affecting->stealth_rock_done=1;
-		//check for magic guard here
-		u32 damage = battle_participants[battle_active_bank].max_hp;
-		switch (type_effectiveness_calc(MOVE_STEALTH_ROCK, TYPE_ROCK, battle_active_bank^1, battle_active_bank, 0) >> 4)
-		{
-			case 1:
-				damage = damage >> 5;
-				break;
-			case 2:
-				damage = damage >> 4;
-				break;
-			case 4:
-				damage = damage >> 3;
-				break;
-			case 8:
-				damage = damage >> 2;
-				break;
-			case 16:
-				damage = damage >> 1;
-				break;
-		}
-		if(damage == 0)
-			damage = 1;
-		battle_damage_store = damage;
-		
-		battle_script_push();
-		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;
-			}
+
+        side_affecting_halfword[active_side].spikes_damage_done = 1;
+        battle_script_push();
+        battlescript_cursor = (void*) (0x081D8CBE);
+        has_effect = 1;
+    } else if (active_side_affecting->stealth_rock && !(active_side_affecting->stealth_rock_done)) {
+        active_side_affecting->stealth_rock_done = 1;
+        //check for magic guard here
+        u32 damage = battle_participants[battle_active_bank].max_hp;
+        switch (type_effectiveness_calc(MOVE_STEALTH_ROCK, TYPE_ROCK, battle_active_bank^1, battle_active_bank, 0) >> 4) {
+            case 1:
+                damage = damage >> 5;
+                break;
+            case 2:
+                damage = damage >> 4;
+                break;
+            case 4:
+                damage = damage >> 3;
+                break;
+            case 8:
+                damage = damage >> 2;
+                break;
+            case 16:
+                damage = damage >> 1;
+                break;
+        }
+        if (damage == 0)
+            damage = 1;
+        battle_damage_store = damage;
+
+        battle_script_push();
+        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;
+            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)
-    {
-       custom_battle_struct.ptr->various.var1 = battle_active_bank;
-       battle_participants[battle_active_bank].status2.destinny_bond = 0;
-       battle_hitmarker &= 0xFFFFFFBF;
     }
-	return has_effect;
+
+    if (has_effect) {
+        custom_battle_elements.ptr->various.var1 = battle_active_bank;
+        battle_participants[battle_active_bank].status2.destinny_bond = 0;
+        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;
+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_elements.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/include/bpre.h

@@ -15,6 +15,10 @@ void clear_flag(u16 flag);
 void* malloc(int size);
 void free(void* address);
 
+//debug
+void agbprintf(const char* pBuf, ...);
+void agbprint_flush();
+void agb_assert(const char *file, int line, const char *expression, u32 stop);
 
 // sound related stuff
 extern MPlayTable mplay_table[];

src/include/custom_structs.h

@@ -4,7 +4,7 @@
 #include <types.h>
 
 struct bank_affecting {
-	u8 embargo : 3;
+    u8 embargo : 3;
     u8 electrify : 1;
     u8 telekinesis: 3;
     u8 magnet_rise : 3;
@@ -53,7 +53,7 @@ struct bank_affecting {
 };
 
 struct side_affecting {
-	u8 sticky_web : 1;
+    u8 sticky_web : 1;
     u8 sticky_web_done : 1;
     u8 toxic_spikes_psn : 1;
     u8 toxic_spikes_badpsn : 1;
@@ -81,7 +81,7 @@ struct side_affecting {
 };
 
 struct field_affecting {
-	u8 trick_room : 3;
+    u8 trick_room : 3;
     u8 wonder_room : 3;
     u8 magic_room : 3;
     u8 grassy_terrain : 3;
@@ -94,7 +94,7 @@ struct field_affecting {
 };
 
 struct various {
-	u8 eaten_berry_player : 6;
+    u8 eaten_berry_player : 6;
     u8 eaten_berry_opponent : 6;
     u8 active_bank : 2;
     u8 inverse_battle : 1;
@@ -117,6 +117,6 @@ struct custom_battle_struct_ptr{
     struct custom_battle_struct *ptr;
 };
 
-extern struct custom_battle_struct_ptr custom_battle_struct;
+extern struct custom_battle_struct_ptr custom_battle_elements;
 
 #endif