first version speed calc system

bpre.sym

@@ -24,6 +24,7 @@ gpu_sprites_upload = 0x08007320|1;
 obj_delete_all = 0x8007770|1;
 camera_move_and_redraw = 0x0805ACB4|1;
 calc_circle = 0x0807EE2C|1;
+random = 0x08044EC8|1;
 
 pal_decompress_slice_to_faded_and_unfaded = 0x080703A8|1;
 gpu_tile_obj_decompress_alloc_tag_and_upload = 0x0800F035;
@@ -94,9 +95,11 @@ battle_hitmarker = 0x02023dd0;
 battle_stat_changer = 0x02023FDE;
 battle_menu_chosen_item = 0x02023D7C;
 battle_stuff_ptr = 0x02023FE8;
+battle_enigma_berry = 0x02023F54;
 side_affecting_halfword = 0x2023DDE;
 
 item_get_quality = 0x0809A948|1;
+item_get_x12 = 0x0809A924|1;
 
 
 battle_status3_bits_pbs = 0x02023DFC;

nbproject/configurations.xml

@@ -4593,6 +4593,7 @@
           <df name="scripts">
             <in>hazards.S</in>
           </df>
+          <in>battle_abilities.c</in>
           <in>battle_help.c</in>
           <in>battle_initiative.c</in>
           <in>battle_initiative.h</in>
@@ -4606,6 +4607,12 @@
         <df name="encode">
           <in>crc32.c</in>
         </df>
+        <df name="include">
+          <in>battle_abilities.h</in>
+          <in>item_effects.h</in>
+          <in>items.h</in>
+          <in>pokemon.h</in>
+        </df>
         <df name="interface">
           <in>lcd_io_test.S</in>
           <in>textbox_mugshots.c</in>
@@ -27158,6 +27165,11 @@
       </item>
       <item path="src/battle_bg/battle_bg_hook.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/battle_engine/battle_abilities.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
       <item path="src/battle_engine/battle_help.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="src/battle_engine/battle_initiative.c"
@@ -27201,6 +27213,14 @@
       </item>
       <item path="src/encode/crc32.c" ex="false" tool="0" flavor2="0">
       </item>
+      <item path="src/include/battle_abilities.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="src/include/item_effects.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="src/include/items.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">
       </item>
       <item path="src/interface/textbox_mugshots.c" ex="false" tool="0" flavor2="0">

nbproject/private/configurations.xml

@@ -4731,6 +4731,7 @@
           <df name="scripts">
             <in>hazards.S</in>
           </df>
+          <in>battle_abilities.c</in>
           <in>battle_help.c</in>
           <in>battle_help.h</in>
           <in>battle_initiative.c</in>
@@ -4750,6 +4751,7 @@
           <in>abilities.h</in>
           <in>attack_names.h</in>
           <in>battle.h</in>
+          <in>battle_abilities.h</in>
           <in>battle_locations.h</in>
           <in>battle_script.h</in>
           <in>battle_structs.h</in>
@@ -4758,10 +4760,13 @@
           <in>config.h</in>
           <in>custom_structs.h</in>
           <in>fade.h</in>
+          <in>item_effects.h</in>
+          <in>items.h</in>
           <in>lcd.h</in>
           <in>moves.h</in>
           <in>objects.h</in>
           <in>pkmn_types.h</in>
+          <in>pokemon.h</in>
           <in>sound.h</in>
           <in>types.h</in>
         </df>

patches/battle_engine/battle_engine.asm

@@ -6,4 +6,9 @@ bx r0
 .org 0x08024FE4
 ldr r4, =battle_switch_in_hook|1
 bx r4
+.pool
+
+.org 0x08014CD8
+ldr r3, =get_first_to_strike|1
+bx r3
 .pool

src/battle_engine/battle_abilities.c

@@ -0,0 +1,22 @@
+#include <battle_abilities.h>
+#include <custom_structs.h>
+
+#include "battle_structs.h"
+
+u8 has_ability_effect(u8 bank, u8 mold_breaker, u8 gastro)
+{
+    if(gastro && custom_battle_elements.ptr->bank_affecting[bank].gastro_acided)
+        return false;
+    return true;
+    //TODO: MOLD BREAKER
+}
+
+u8 weather_abilities_effect()
+{
+    //TODO: AIR LOCK AND CLOUD NINE
+    return true;
+}
+u8 has_ability(u8 bank, u8 ability)
+{
+    return (has_ability_effect(bank,0,1) && battle_participants[bank].ability_id == ability);
+}

src/battle_engine/battle_help.c

@@ -89,6 +89,18 @@ u8 has_type(u8 bank, u8 type) {
     return battle_participants[bank].type1 == type || battle_participants[bank].type2 == type;
 }
 
+u8 get_item_effect(u8 bank, u8 check_negating_effects) {
+    if (check_negating_effects) {
+        if (battle_participants[bank].ability_id == ABILITY_KLUTZ || custom_battle_elements.ptr->bank_affecting[bank].embargo)
+            return ITEM_EFFECT_NOEFFECT;
+    }
+    if (battle_participants[bank].held_item == ITEM_ENIGMABERRY) {
+        return battle_enigma_berry[bank].battle_effect_x12;
+    } else {
+        return item_get_x12(battle_participants[bank].held_item);
+    }
+}
+
 u8 cant_poison(u8 bank, u8 self_inflicted) { //0 == can poison
     //1 == is already poisoned
     //2 == has other major condition

src/battle_engine/battle_help.h

@@ -3,6 +3,7 @@
 #ifndef BATTLE_HELP_H_
 #define BATTLE_HELP_H_
 
+u8 get_item_effect(u8 bank, u8 check_negating_effects);
 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);

src/battle_engine/battle_initiative.c

@@ -1,7 +1,54 @@
 #include "battle_initiative.h"
-
 struct move_info move_table[1024];
 
+u16 get_speed(u8 bank) {
+    u16 speed = battle_participants[bank].spd;
+    switch (get_item_effect(bank, 1)) {
+        case ITEM_EFFECT_IRONBALL:
+            speed >>= 1;
+            break;
+        case ITEM_EFFECT_CHOICESCARF:
+            speed = (speed * 150) / 100;
+            break;
+        case ITEM_EFFECT_QUICKPOWDER:
+            if (battle_participants[bank].poke_species == POKE_DITTO && !battle_participants[bank].status2.transformed)
+                speed <<= 1;
+            break;
+    }
+    if(has_ability_effect(bank, 0, 1))
+    {
+        u8 weather_effects = weather_abilities_effect();
+        switch (battle_participants[bank].ability_id)
+        {
+            case ABILITY_CHLOROPHYLL:
+                if(weather_effects && (battle_weather.flags.harsh_sun || battle_weather.flags.permament_sun || battle_weather.flags.sun))
+                    speed *=2;
+                break;
+            case ABILITY_SWIFT_SWIM:
+                if(weather_effects && (battle_weather.flags.rain || battle_weather.flags.downpour || battle_weather.flags.permament_rain || battle_weather.flags.heavy_rain))
+                    speed *=2;
+                break;
+            case ABILITY_SAND_RUSH:
+                if(weather_effects && (battle_weather.flags.sandstorm || battle_weather.flags.permament_sandstorm))
+                    speed *= 2;
+                break;
+            case ABILITY_QUICK_FEET:
+                if(battle_participants[bank].status.flags.burn || battle_participants[bank].status.flags.poison || battle_participants[bank].status.flags.toxic_poison)
+                    speed *= 2;
+                else if(battle_participants[bank].status.flags.paralysis)
+                    speed *= 4;
+                break;
+        }
+    }
+    if(battle_participants[bank].status.flags.paralysis)
+        speed >= 2;
+    if(custom_battle_elements.ptr->side_affecting[get_side_from_bank(bank)].tailwind)
+        speed *= 2;
+    //TODO: unburden
+    speed = (speed * stat_buffs[battle_participants[bank].spd_buff].dividend) / (stat_buffs[battle_participants[bank].spd_buff].divisor);
+    return speed;
+}
+
 enum init_enum get_first_to_strike(u8 bank_one, u8 bank_two, u8 ignore_prio) {
     enum init_enum result = TIE;
     //TODO: implement quash
@@ -22,8 +69,31 @@ enum init_enum get_first_to_strike(u8 bank_one, u8 bank_two, u8 ignore_prio) {
             result = TWO;
     }
     if (result == TIE) {
-        //TODO: calculate item effects
+        //TODO: calculate item bracket effects
         //TODO: calculate speed
+        u8 stall_one = has_ability(bank_one, ABILITY_STALL);
+        u8 stall_two = has_ability(bank_two, ABILITY_STALL);
+        if(stall_one && !stall_two)
+            result = TWO;
+        else if(stall_two && !stall_one)
+            result = ONE;
+        else
+        {
+            u16 speed_one = get_speed(bank_one);
+            u16 speed_two = get_speed(bank_two);
+            if(custom_battle_elements.ptr->field_affecting.trick_room || (stall_one && stall_two))
+            {
+                u16 swap_speed = speed_one;
+                speed_one = speed_two;
+                speed_two = swap_speed;
+            }
+            if(speed_one > speed_two)
+                result = ONE;
+            else if(speed_two > speed_one)
+                result = TWO;
+            else if (random() & 1)
+                result = ONE;
+        }
     }
     return result;
 }

src/battle_engine/battle_initiative.h

@@ -2,11 +2,12 @@
 #define BATTLE_INITIATIVE_H
 
 #include <battle.h>
+#include "battle_help.h"
 #include <bpre.h>
 
 enum init_enum {ONE, TWO, TIE};
 
-enum init_enum get_first_strike_bank(u8 bank1, u8 bank2, u8 ignore_prio);
+enum init_enum get_first_to_strike(u8 bank1, u8 bank2, u8 ignore_prio);
 
 #endif /* BATTLE_INITIATIVE_H */
 

src/battle_engine/custom_structs_malloc.c

@@ -6,9 +6,6 @@
 void malloc_battle_structs()
 {
 	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()

src/include/battle.h

@@ -4,6 +4,10 @@
 #include <pkmn_types.h>
 #include <abilities.h>
 #include <moves.h>
+#include <item_effects.h>
+#include <items.h>
+#include <pokemon.h>
+#include <battle_abilities.h>
 
 #ifndef BATTLE_H_
 #define BATTLE_H_
@@ -11,11 +15,18 @@
 #define REQUEST_HELDITEM_BATTLE 0x2
 #define REQUEST_STATUS_BATTLE 0x28
 
+struct stat_fractions{
+    u8 dividend;
+    u8 divisor;
+};
+
+struct stat_fractions stat_buffs[] = { {2, 8}, {2, 7}, {2, 6}, {2, 5}, {2, 4}, {2, 3}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}, {7, 2}, {8, 2} };
+
 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);
-
+u8 get_item_x12_battle_function(u16 item_id);
 void battle_script_push();
 
 #endif

src/include/battle_abilities.h

@@ -0,0 +1,11 @@
+#ifndef BATTLE_ABILITIES_H
+#define BATTLE_ABILITIES_H
+
+#include <bpre.h>
+
+u8 has_ability_effect(u8 bank, u8 mold_breaker, u8 gastro);
+u8 weather_abilities_effect();
+u8 has_ability(u8 bank, u8 ability);
+
+#endif /* BATTLE_ABILITIES_H */
+

src/include/battle_structs.h

@@ -250,4 +250,14 @@ struct move_info{
     u8 arg2;
 };
 
+struct b_enigma_berry{
+    u8 field0[7];
+    u8 battle_effect_x12;
+    u8 field8[18];
+    u8 quality;
+    u8 field1B;
+};
+
+extern struct b_enigma_berry battle_enigma_berry[4];
+
 #endif

src/include/bpre.h

@@ -11,7 +11,7 @@
 u16 *var_access(int index);
 u8 flag_check(int flag);
 void clear_flag(u16 flag);
-
+u16 random();
 void* malloc(int size);
 void free(void* address);
 

src/include/item_effects.h

@@ -0,0 +1,143 @@
+#ifndef ITEM_BATTLE_EFFECTS_H
+#define ITEM_BATTLE_EFFECTS_H
+
+#define ITEM_EFFECT_NOEFFECT 0
+#define ITEM_EFFECT_ORANBERRY 1
+#define ITEM_EFFECT_CHERIBERRY 2
+#define ITEM_EFFECT_CHESTOBERRY 3
+#define ITEM_EFFECT_PECHABERRY 4
+#define ITEM_EFFECT_RAWSTBERRY 5
+#define ITEM_EFFECT_ASPEARBERRY 6
+#define ITEM_EFFECT_LEPPABERRY 7
+#define ITEM_EFFECT_PERSIMBERRY 8
+#define ITEM_EFFECT_LUMBERRY 9
+#define ITEM_EFFECT_FIGYBERRY 0xA
+#define ITEM_EFFECT_WIKIBERRY 0xB
+#define ITEM_EFFECT_MAGOBERRY 0xC
+#define ITEM_EFFECT_AGUAVBERRY 0xD
+#define ITEM_EFFECT_IAPAPABERRY 0xE
+#define ITEM_EFFECT_LIECHIBERRY 0xF
+#define ITEM_EFFECT_GANLONBERRY 0x10
+#define ITEM_EFFECT_SALACBERRY 0x11
+#define ITEM_EFFECT_PETAYABERRY 0x12
+#define ITEM_EFFECT_APICOTBERRY 0x13
+#define ITEM_EFFECT_LANSATBERRY 0x14
+#define ITEM_EFFECT_STARFBERRY 0x15
+#define ITEM_EFFECT_BRIGHTPOWDER 0x16
+#define ITEM_EFFECT_WHITEHERB 0x17
+#define ITEM_EFFECT_MACHOBRACE 0x18
+#define ITEM_EFFECT_EXPSHARE 0x19
+#define ITEM_EFFECT_QUICKCLAW 0x1A
+#define ITEM_EFFECT_SOOTHEBELL 0x1B
+#define ITEM_EFFECT_MENTALHERB 0x1C
+#define ITEM_EFFECT_CHOICEBAND 0x1D
+#define ITEM_EFFECT_KINGSROCK 0x1E
+#define ITEM_EFFECT_SILVERPOWDER 0x1F
+#define ITEM_EFFECT_AMULETCOIN 0x20
+#define ITEM_EFFECT_CLENSEATAG 0x21
+#define ITEM_EFFECT_SOULDEW 0x22
+#define ITEM_EFFECT_DEEPSEATOOTH 0x23
+#define ITEM_EFFECT_DEEPSEASCALE 0x24
+#define ITEM_EFFECT_SMOKEBALL 0x25
+#define ITEM_EFFECT_EVERSTONE 0x26
+#define ITEM_EFFECT_FOCUSBAND 0x27
+#define ITEM_EFFECT_LUCKYEGG 0x28
+#define ITEM_EFFECT_SCOPELENS 0x29
+#define ITEM_EFFECT_METALCOAT 0x2A
+#define ITEM_EFFECT_LEFTOVERS 0x2B
+#define ITEM_EFFECT_DRAGONSCALE 0x2C
+#define ITEM_EFFECT_LIGHTBALL 0x2D
+#define ITEM_EFFECT_SOFTSAND 0x2E
+#define ITEM_EFFECT_HARDSTONE 0x2F
+#define ITEM_EFFECT_MIRACLESEED 0x30
+#define ITEM_EFFECT_BLACKGLASSES 0x31
+#define ITEM_EFFECT_BLACKBELT 0x32
+#define ITEM_EFFECT_MAGNET 0x33
+#define ITEM_EFFECT_MYSTICWATER 0x34
+#define ITEM_EFFECT_SHARPBEAK 0x35
+#define ITEM_EFFECT_POISONBARB 0x36
+#define ITEM_EFFECT_NEVERMELTICE 0x37
+#define ITEM_EFFECT_SPELLTAG 0x38
+#define ITEM_EFFECT_TWISTEDSPOON 0x39
+#define ITEM_EFFECT_CHARCOAL 0x3A
+#define ITEM_EFFECT_DRAGONFANG 0x3B
+#define ITEM_EFFECT_SILKSCARF 0x3C
+#define ITEM_EFFECT_UPGRADE 0x3D
+#define ITEM_EFFECT_SHELLBELL 0x3E
+#define ITEM_EFFECT_LUCKYPUNCH 0x3F
+#define ITEM_EFFECT_METALPOWDER 0x40
+#define ITEM_EFFECT_THICKCLUB 0x41
+#define ITEM_EFFECT_STICK 0x42
+
+//new effects
+#define ITEM_EFFECT_FAIRYPLATE 0x46
+#define ITEM_EFFECT_CHOICESPECS 0x47
+#define ITEM_EFFECT_ADAMANTORB 0x48
+#define ITEM_EFFECT_GRISEOUSORB 0x49
+#define ITEM_EFFECT_LIFEORB 0x4A
+#define ITEM_EFFECT_LUSTROUSORB 0x4B
+#define ITEM_EFFECT_EVIOLITE 0x4C
+#define ITEM_EFFECT_ASSAULTVEST 0x4D
+#define ITEM_EFFECT_MUSCLEBAND 0x4E
+#define ITEM_EFFECT_WISEGLASSES 0x4F
+#define ITEM_EFFECT_BURNDRIVE 0x50
+#define ITEM_EFFECT_CHILLDRIVE 0x51
+#define ITEM_EFFECT_DOUSEDRIVE 0x52
+#define ITEM_EFFECT_SHOCKDRIVE 0x53
+#define ITEM_EFFECT_RINGTARGET 0x54
+#define ITEM_EFFECT_EXPERTBELT 0x55
+#define ITEM_EFFECT_OCCABERRY 0x56
+#define ITEM_EFFECT_PASSHOBERRY 0x57
+#define ITEM_EFFECT_WACANBERRY 0x58
+#define ITEM_EFFECT_RINDOBERRY 0x59
+#define ITEM_EFFECT_YACHEBERRY 0x5A
+#define ITEM_EFFECT_CHOPLEBERRY 0x5B
+#define ITEM_EFFECT_KEBIABERRY 0x5C
+#define ITEM_EFFECT_SHUCABERRY 0x5D
+#define ITEM_EFFECT_COBABERRY 0x5E
+#define ITEM_EFFECT_PAPAYABERRY 0x5F
+#define ITEM_EFFECT_TANGABERRY 0x60
+#define ITEM_EFFECT_CHARTIBERRY 0x61
+#define ITEM_EFFECT_KASIBBERRY 0x62
+#define ITEM_EFFECT_HABANBERRY 0x63
+#define ITEM_EFFECT_COLBURBERRY 0x64
+#define ITEM_EFFECT_BABIRIBERRY 0x65
+#define ITEM_EFFECT_ROSELIBERRY 0x66
+#define ITEM_EFFECT_CHILANBERRY 0x67
+#define ITEM_EFFECT_WIDELENS 0x68
+#define ITEM_EFFECT_ZOOMLENS 0x69
+#define ITEM_EFFECT_FOCUSSASH 0x6A
+#define ITEM_EFFECT_SAFETYGOOGLES 0x6B
+#define ITEM_EFFECT_CHOICESCARF 0x6C
+#define ITEM_EFFECT_LAGGINGTAIL 0x6D
+#define ITEM_EFFECT_FLOATSTONE 0x6E
+#define ITEM_EFFECT_METRONOME 0x6F
+#define ITEM_EFFECT_IRONBALL 0x70
+#define ITEM_EFFECT_AIRBALLOON 0x71
+#define ITEM_EFFECT_HEATROCK 0x72
+#define ITEM_EFFECT_DAMPROCK 0x73
+#define ITEM_EFFECT_SMOOTHROCK 0x74
+#define ITEM_EFFECT_ICYROCK 0x75
+#define ITEM_EFFECT_SITRUSBERRY 0x76
+#define ITEM_EFFECT_BLACKSLUDGE 0x77
+#define ITEM_EFFECT_STICKYBARB 0x78
+#define ITEM_EFFECT_FLAMEORB 0x79
+#define ITEM_EFFECT_TOXICORB 0x7A
+#define ITEM_EFFECT_WEAKNESSPOLICY 0x7B
+#define ITEM_EFFECT_EJECTBUTTON 0x7C
+#define ITEM_EFFECT_REDCARD 0x7D
+#define ITEM_EFFECT_ROCKYHELMET 0x7E
+#define ITEM_EFFECT_LIGHTCLAY 0x7F
+#define ITEM_EFFECT_DESTINYKNOT 0x80
+#define ITEM_EFFECT_LUMINOUSMOSS 0x81
+#define ITEM_EFFECT_CELLBATTERY 0x82
+#define ITEM_EFFECT_SNOWBALL 0x83
+#define ITEM_EFFECT_ABSORBBULB 0x84
+#define ITEM_EFFECT_QUICKPOWDER 0x85
+#define ITEM_EFFECT_BIGROOT 0x86
+#define ITEM_EFFECT_BINDINGBAND 0x87
+#define ITEM_EFFECT_GRIPCLAW 0x88
+#define ITEM_EFFECT_CUSTAPBERRY 0x89
+#define ITEM_EFFECT_POWERHERB 0x8A
+
+#endif /* ITEM_BATTLE_EFFECTS_H_H */

src/include/items.h

@@ -0,0 +1,6 @@
+#ifndef ITEM_IDS_H
+#define ITEM_IDS_H
+
+#define ITEM_ENIGMABERRY 0xAF
+
+#endif /* ITEM_IDS */

src/include/pokemon.h

@@ -0,0 +1,18 @@
+#ifndef POKE_INDICES_H
+#define POKE_INDICES_H
+
+#define POKE_PIKACHU 0x19
+#define POKE_CUBONE 0x68
+#define POKE_MAROWAK 0x69
+#define POKE_FARFETCHD 0x53
+#define POKE_CHANSEY 0x71
+#define POKE_DITTO 132
+#define POKE_CLAMPERL 0x175
+#define POKE_LATIAS 0x197
+#define POKE_LATIOS 0x198
+#define POKE_CHERRIM 0x200
+#define POKE_DIALGA 0x218
+#define POKE_PALKIA 0x219
+#define POKE_GIRATINA 0x21C || 0x21C //for that another form
+
+#endif /* POKE_INDICES_H */

src/include/types.h

@@ -14,6 +14,11 @@ typedef     signed long long int    s64;
 typedef     float                   f32;
 typedef     double                  f64;
 
+#define true 1
+#define false 0
+
+#define NULL 0
+
 #define		rgb5(r,g,b)				(u16)( r | ( g << 5) | ( b << 10) )
 
 #endif