added unburden to init calc

makefile

@@ -6,14 +6,14 @@ CC      := @arm-none-eabi-gcc
 ARS     := armips
 MAKE    := make
 NM      := @arm-none-eabi-nm
-LAN		:= de
+LAN	:= de
 STRAGB	:= string2agb
 
 export PATH := $(realpath ../tools):$(PATH)
 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
 ASFLAGS   := -mthumb
-CFLAGS    := -mthumb -mno-thumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include $(DEFINES)
+CFLAGS    := -mthumb -mno-thumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O0 -std=c99 -Wall -Isrc/include $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -52,7 +52,7 @@ DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
 ALL_OBJ     := $(C_OBJ) $(ASM_OBJ_PP) $(ASM_OBJ) $(DATA_OBJ_PP) $(DATA_OBJ)
 
 
-
+.PRECIOUS: $(STRING_SRC)
 $(STRINGDIR)/%.S: $(STRINGDIR)/%.txt
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
 

nbproject/private/configurations.xml

@@ -55,8 +55,11 @@
           <in>pokemon_tm_vm.s</in>
         </df>
       </df>
+      <df name="doc">
+      </df>
       <df name="gfx_build">
         <df name="icons">
+          <in>305.s</in>
         </df>
         <df name="overworlds">
           <in>ow_0000.s</in>
@@ -4256,6 +4259,16 @@
         </df>
       </df>
       <df name="object">
+        <df name="data">
+          <df name="item">
+          </df>
+          <df name="moves">
+          </df>
+          <df name="overworld">
+          </df>
+          <df name="pkmn_tables">
+          </df>
+        </df>
         <df name="src">
           <df name="assets">
             <df name="meteor">
@@ -6223,6 +6236,12 @@
       </df>
       <df name="string">
         <df name="de">
+          <in>hazards.S</in>
+          <in>item_data.S</in>
+          <in>item_descriptions.S</in>
+          <in>move_descriptions.S</in>
+          <in>move_names.S</in>
+          <in>move_strings.S</in>
         </df>
         <df name="en">
         </df>

sots-private

@@ -1 +1 @@
-Subproject commit 9cda479e9af1b39b15891190ab843fb2559ea29b
+Subproject commit 2020088a019c62e8bd095565efc41d1f806e092c

src/battle_engine/battle_help.c

@@ -85,11 +85,11 @@ u16 battle_damage_type_effectiveness_update(u8 attacking_type, u8 defending_type
             effect = 20;
         }
     }
-    //handle normal / fighting on ghost
+    /* handle normal / fighting on ghost */
     if ((((attacking_type == TYPE_NORMAL || attacking_type == TYPE_FIGHTING) && defending_type == TYPE_GHOST && ((battle_participants[def_bank].status2.foresight))) || battle_participants[atk_bank].ability_id == ABILITY_SCRAPPY) && effect == 0) {
         effect = 10;
     }
-    //handle other effectiveness changers here
+    /* handle other effectiveness changers here */
 
     switch (effect) {
         case 0:
@@ -109,7 +109,7 @@ u16 battle_damage_type_effectiveness_update(u8 attacking_type, u8 defending_type
 u16 battle_apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_bank, u8 atk_bank, u8 airstatus) {
     u8 defender_type1 = battle_participants[target_bank].type1;
     u8 defender_type2 = battle_participants[target_bank].type2;
-    //set different types
+    /* set different types */
     if (defender_type2 == defender_type1)
         defender_type2 = TYPE_EGG;
     chained_effect = battle_damage_type_effectiveness_update(move_type, defender_type1, atk_bank, target_bank, chained_effect, airstatus);

src/battle_engine/battle_initiative.c

@@ -81,7 +81,7 @@ u16 get_speed(u8 bank) {
                 if (battle_participants[bank].status.flags.burn || battle_participants[bank].status.flags.poison || battle_participants[bank].status.flags.toxic_poison)
                     speed = speed + ((speed * 50) / 100);
                 else if (battle_participants[bank].status.flags.paralysis) {
-                    //cancel para
+                    /* cancel para */
                     speed *= 4;
                     speed = speed + ((speed * 50) / 100);
                 }
@@ -92,7 +92,9 @@ u16 get_speed(u8 bank) {
         speed >>= 2;
     if (custom_battle_elements.ptr->side_affecting[get_side_from_bank(bank)].tailwind)
         speed *= 2;
-    //TODO: unburden
+    if (battle_status_3[bank].unburden)
+        speed *= 2;
+    //TODO: /* SWAMP EFFECT */
     speed = (speed * stat_buffs[battle_participants[bank].spd_buff].dividend) / (stat_buffs[battle_participants[bank].spd_buff].divisor);
     return (u16) (speed >> 16);
 }
@@ -129,7 +131,8 @@ enum init_enum get_first_to_strike(u8 bank_one, u8 bank_two, u8 ignore_prio) {
 
         s8 prio_one = 0;
         s8 prio_two = 0;
-        //note priority changing effects and abilities not added as of yet
+        /* note priority changing effects and abilities not added as of yet */
+        /* NOTE: !HANDLE PRIORITY LIKE A PROPERTY! */
         if (battle_menu_chosen_item[bank_one] == 0)
             prio_one = move_table[move_one].priority;
         if (battle_menu_chosen_item[bank_two] == 0)