Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

battle_engine

-Subproject commit a201b518834f0208efdb82ac95b08675f5279950
+Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382

g3headers

-Subproject commit bcc741a7ec06fc8a1b7c0e0b93a7f94f318a658e
+Subproject commit 21b52cecff9250d0bdaf18660b4bea40606a675e

main.asm

 .include "patches/pokemon_data/pokedex_entries.asm"
 .include "patches/pokemon_data/pokemon_names.asm"
 .include "patches/pokemon_data/limits.asm"
+
 .include "patches/pokemon_data/pokemon_stats.asm"
 .include "patches/pokemon_data/moveset_table.asm"
 .include "patches/pokemon_data/pokemon_back_sprites.asm"
 .include "patches/pokemon_data/pokemon_front_sprites.asm"
 .include "patches/pokemon_data/pokemon_normal_pal.asm"
 .include "patches/pokemon_data/pokemon_shiny_pal.asm"
+
 .include "patches/pokemon_data/pokemon_icons.asm"
+
 .include "patches/pokemon_data/pokemon_habitats.asm"
 .include "patches/pokemon_data/pokemon_evolution.asm"
 

patches/graphics/char.asm

 .org 0x08234718
 .word hero_backspriteTiles
+.word 0x800
+.word hero_backspriteTiles + 0x800
+.word 0x800
+.word hero_backspriteTiles + 0x800*2
+.word 0x800
+.word hero_backspriteTiles + 0x800*3
+.word 0x800
+.word hero_backspriteTiles + 0x800*4
+.word 0x800
 
 .org 0x08239FA4
 .word hero_backspriteTiles
+.word 0x800
 
 .org 0x08239FD4
 .word hero_backspritePal
 
 .org 0x08234740
 .word heroine_backspriteTiles
+.word 0x800
+.word heroine_backspriteTiles + 0x800
+.word 0x800
+.word heroine_backspriteTiles + 0x800*2
+.word 0x800
+.word heroine_backspriteTiles + 0x800*3
+.word 0x800
+.word heroine_backspriteTiles + 0x800*4
+.word 0x800
 
 .org 0x08239FAC
 .word heroine_backspriteTiles

patches/pokemon_data/pokemon_icons.asm

 .word icon_palette_table
 
 .org 0x08091390
-.word icon_palette_table
+//.word icon_palette_table
+/* NOTE: this is referencing the icon template, overriding this will break stuff, for now we do not need to modify the template */
+
 
 .org 0x08096EC0
 .word icon_palette_table

src/battle_engine/battle_help.c

 
 /* === INCLUDE === */
 
+#include <battle_common.h>
+#include <battle_custom_structs.h>
 #include <battle_help.h>
 #include <battle_locations.h>
-#include <battle_custom_structs.h>
 #include <game_engine.h>
-#include <pkmn_types.h>
 #include <pkmn_abilities.h>
+#include <pkmn_attributes.h>
 #include <pkmn_item_effects.h>
 #include <pkmn_items.h>
-#include <pkmn_attributes.h>
-#include <battle_common.h>
+#include <pkmn_types.h>
 
 /* === STATICS === */
 
 /* from kds emerald battle engine upgrade */
 u8 type_effectiveness_table[TYPE_FAIRY - 0x4][TYPE_FAIRY - 0x4] = {
-    {10, 10, 10, 10, 10, 05, 10, 00, 05, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, //normal
-    {20, 10, 05, 05, 10, 20, 05, 00, 20, 10, 10, 10, 10, 10, 05, 20, 10, 20, 05}, //fight
-    {10, 20, 10, 10, 10, 05, 20, 10, 05, 10, 10, 10, 20, 05, 10, 10, 10, 10, 10}, //flying
-    {10, 10, 10, 05, 05, 05, 10, 05, 00, 10, 10, 10, 20, 10, 10, 10, 10, 10, 20}, //poison
-    {10, 10, 00, 20, 10, 20, 05, 10, 20, 10, 20, 10, 05, 20, 10, 10, 10, 10, 10}, //ground
-    {10, 05, 20, 10, 05, 10, 20, 10, 05, 10, 20, 10, 10, 10, 10, 20, 10, 10, 10}, //rock
-    {10, 05, 05, 05, 10, 10, 10, 05, 05, 10, 05, 10, 20, 10, 20, 10, 10, 20, 05}, //bug
-    {00, 10, 10, 10, 10, 10, 10, 20, 10, 10, 10, 10, 10, 10, 20, 10, 10, 05, 10}, //ghost
-    {10, 10, 10, 10, 10, 20, 10, 10, 05, 10, 05, 05, 10, 05, 10, 20, 10, 10, 20}, //steel
-    {10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, //egg
-    {10, 10, 10, 10, 10, 05, 20, 10, 20, 10, 05, 05, 20, 10, 10, 20, 05, 10, 10}, //fire
-    {10, 10, 10, 10, 20, 20, 10, 10, 10, 10, 20, 05, 05, 10, 10, 10, 05, 10, 10}, //water
-    {10, 10, 05, 05, 20, 20, 05, 10, 05, 10, 05, 20, 05, 10, 10, 10, 05, 10, 10}, //grass
-    {10, 10, 20, 10, 00, 10, 10, 10, 10, 10, 10, 20, 05, 05, 10, 10, 05, 10, 10}, //electric
-    {10, 20, 10, 20, 10, 10, 10, 10, 05, 10, 10, 10, 10, 10, 05, 10, 10, 00, 10}, //psychic
-    {10, 10, 20, 10, 20, 10, 10, 10, 05, 10, 05, 05, 20, 10, 10, 05, 20, 10, 10}, //ice
-    {10, 10, 10, 10, 10, 10, 10, 10, 05, 10, 10, 10, 10, 10, 10, 10, 20, 10, 00}, //dragon
-    {10, 05, 10, 10, 10, 10, 10, 20, 10, 10, 10, 10, 10, 10, 20, 10, 10, 05, 05}, //dark
-    {10, 20, 10, 05, 10, 10, 10, 10, 05, 10, 05, 10, 10, 10, 10, 10, 20, 20, 10} //fairy
+    {10, 10, 10, 10, 10, 05, 10, 00, 05, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, // normal
+    {20, 10, 05, 05, 10, 20, 05, 00, 20, 10, 10, 10, 10, 10, 05, 20, 10, 20, 05}, // fight
+    {10, 20, 10, 10, 10, 05, 20, 10, 05, 10, 10, 10, 20, 05, 10, 10, 10, 10, 10}, // flying
+    {10, 10, 10, 05, 05, 05, 10, 05, 00, 10, 10, 10, 20, 10, 10, 10, 10, 10, 20}, // poison
+    {10, 10, 00, 20, 10, 20, 05, 10, 20, 10, 20, 10, 05, 20, 10, 10, 10, 10, 10}, // ground
+    {10, 05, 20, 10, 05, 10, 20, 10, 05, 10, 20, 10, 10, 10, 10, 20, 10, 10, 10}, // rock
+    {10, 05, 05, 05, 10, 10, 10, 05, 05, 10, 05, 10, 20, 10, 20, 10, 10, 20, 05}, // bug
+    {00, 10, 10, 10, 10, 10, 10, 20, 10, 10, 10, 10, 10, 10, 20, 10, 10, 05, 10}, // ghost
+    {10, 10, 10, 10, 10, 20, 10, 10, 05, 10, 05, 05, 10, 05, 10, 20, 10, 10, 20}, // steel
+    {10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, // egg
+    {10, 10, 10, 10, 10, 05, 20, 10, 20, 10, 05, 05, 20, 10, 10, 20, 05, 10, 10}, // fire
+    {10, 10, 10, 10, 20, 20, 10, 10, 10, 10, 20, 05, 05, 10, 10, 10, 05, 10, 10}, // water
+    {10, 10, 05, 05, 20, 20, 05, 10, 05, 10, 05, 20, 05, 10, 10, 10, 05, 10, 10}, // grass
+    {10, 10, 20, 10, 00, 10, 10, 10, 10, 10, 10, 20, 05, 05, 10, 10, 05, 10, 10}, // electric
+    {10, 20, 10, 20, 10, 10, 10, 10, 05, 10, 10, 10, 10, 10, 05, 10, 10, 00, 10}, // psychic
+    {10, 10, 20, 10, 20, 10, 10, 10, 05, 10, 05, 05, 20, 10, 10, 05, 20, 10, 10}, // ice
+    {10, 10, 10, 10, 10, 10, 10, 10, 05, 10, 10, 10, 10, 10, 10, 10, 20, 10, 00}, // dragon
+    {10, 05, 10, 10, 10, 10, 10, 20, 10, 10, 10, 10, 10, 10, 20, 10, 10, 05, 05}, // dark
+    {10, 20, 10, 05, 10, 10, 10, 10, 05, 10, 05, 10, 10, 10, 10, 10, 20, 20, 10}  // fairy
 };
 
 /* === IMPLEMENTATIONS === */
-u16 battle_damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 atk_bank, u8 def_bank, u16 chained_effect, u8 airstatus) {
+u16 battle_damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 atk_bank, u8 def_bank,
+                                            u16 chained_effect, u8 airstatus) {
     u8 effect, atype = attacking_type, dtype = defending_type;
     if (!chained_effect || atype == TYPE_EGG || dtype == TYPE_EGG)
         return chained_effect;
         }
     }
     /* 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) {
+    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 */
 
     switch (effect) {
-        case 0:
-            chained_effect = 0;
-            break;
-        case 5:
-            chained_effect = chained_effect >> 1;
-            break;
-        case 20:
-            chained_effect = chained_effect << 1;
-            break;
+    case 0:
+        chained_effect = 0;
+        break;
+    case 5:
+        chained_effect = chained_effect >> 1;
+        break;
+    case 20:
+        chained_effect = chained_effect << 1;
+        break;
     }
     return chained_effect;
-
 }
 
 u16 battle_apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_bank, u8 atk_bank, u8 airstatus) {
     /* 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);
-    chained_effect = battle_damage_type_effectiveness_update(move_type, defender_type2, atk_bank, target_bank, chained_effect, airstatus);
+    chained_effect = battle_damage_type_effectiveness_update(move_type, defender_type1, atk_bank, target_bank,
+                                                             chained_effect, airstatus);
+    chained_effect = battle_damage_type_effectiveness_update(move_type, defender_type2, atk_bank, target_bank,
+                                                             chained_effect, airstatus);
     return chained_effect;
 }
 
-u16 battle_type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank, u8 effects_handling_and_recording) {
+u16 battle_type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank,
+                                   u8 effects_handling_and_recording) {
     u16 chained_effect = 64;
-    //TODO: double_type moves
-    //TODO: get air status
+    // TODO: double_type moves
+    // TODO: get air status
     chained_effect = battle_apply_type_effectiveness(chained_effect, move_type, def_bank, atk_bank, 2);
-    //TODO: save into structs
-    //TODO: effect_handling_and_recording
+    // TODO: save into structs
+    // TODO: effect_handling_and_recording
     return chained_effect;
 }
 
 
 u8 battle_item_get_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)
+        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) {
     }
 }
 
-u8 battle_bank_is_poison_resistant(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!
+u8 battle_bank_is_poison_resistant(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 (battle_bank_has_type(bank, TYPE_POISON) || battle_bank_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)))))
+    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;
 }
 
-u8 battle_count_party_pokemon(u8 bank)
-{
-    struct pokemon* poke;
+u8 battle_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 (pokemon_get_attribute(&poke[i], ATTR_CURRENT_HP, 0) != 0 && pokemon_get_attribute(&poke[i], ATTR_IS_EGG, 0) != 1 && pokemon_get_attribute(&poke[i], ATTR_SPECIES, 0) != 0)
+    for (u8 i = 0; i < 6; i++) {
+        if (pokemon_get_attribute(&poke[i], ATTR_CURRENT_HP, 0) != 0 &&
+            pokemon_get_attribute(&poke[i], ATTR_IS_EGG, 0) != 1 &&
+            pokemon_get_attribute(&poke[i], ATTR_SPECIES, 0) != 0)
             usable_pokes++;
     }
     return usable_pokes;

src/battle_engine/battle_load_elements/battle_load_elements.c

-#include <config.h>
-#include <pokeagb/pokeagb.h>
 #include <battlescreen/battlescreen_0.h>
 #include <battlescreen/battlescreen_1.h>
-#include <battlescreen/battlescreen_2.h>
-#include <battlescreen/battlescreen_3.h>
-#include <battlescreen/battlescreen_4.h>
-#include <battlescreen/battlescreen_5.h>
-#include <battlescreen/battlescreen_6.h>
-#include <battlescreen/battlescreen_7.h>
-#include <battlescreen/battlescreen_8.h>
-#include <battlescreen/battlescreen_9.h>
 #include <battlescreen/battlescreen_10.h>
 #include <battlescreen/battlescreen_11.h>
 #include <battlescreen/battlescreen_12.h>
 #include <battlescreen/battlescreen_17.h>
 #include <battlescreen/battlescreen_18.h>
 #include <battlescreen/battlescreen_19.h>
+#include <battlescreen/battlescreen_2.h>
 #include <battlescreen/battlescreen_20.h>
 #include <battlescreen/battlescreen_21.h>
 #include <battlescreen/battlescreen_22.h>
 #include <battlescreen/battlescreen_23.h>
 #include <battlescreen/battlescreen_24.h>
-
+#include <battlescreen/battlescreen_3.h>
+#include <battlescreen/battlescreen_4.h>
+#include <battlescreen/battlescreen_5.h>
+#include <battlescreen/battlescreen_6.h>
+#include <battlescreen/battlescreen_7.h>
+#include <battlescreen/battlescreen_8.h>
+#include <battlescreen/battlescreen_9.h>
+#include <config.h>
+#include <pokeagb/pokeagb.h>
 
 #define SIZEOF_ARR(a) (sizeof(a) / sizeof(a[0]))
 #define BATTLE_ELEMENT(n)                                                                                              \

src/debug/debug.c

 
 /* === INCLUDE === */
 
-#include <types.h>
-#include <callback.h>
-#include <lcd.h>
-#include <debug.h>
-#include <memory.h>
 #include <assets/ascii.h>
 #include <battle_test.h>
-#include <math.h>
+#include <callback.h>
+#include <debug.h>
 #include <fade.h>
+#include <lcd.h>
+#include <math.h>
+#include <memory.h>
+#include <types.h>
 
 /* === STRUCTURES === */
 
-struct assert_memory
-{
-    char* file;
+struct assert_memory {
+    char *file;
     int line;
-    char* expression;
+    char *expression;
 };
 
 /* === STATICS === */
-struct assert_memory* assert_global = (struct assert_memory*)0x0203FEC4;
-static struct print_engine* print_memory = (struct print_engine*)(0x0203FFF0);
+struct assert_memory *assert_global = (struct assert_memory *)0x0203FEC4;
+static struct print_engine *print_memory = (struct print_engine *)(0x0203FFF0);
 
 /* === PROTOTYPES === */
 
  * @param i integer
  * @param ref buffer to output to
  */
-void debug_int_to_char(u32 i, char* ref);
+void debug_int_to_char(u32 i, char *ref);
 
 /**
  * @get length of integer
  * @param color color to print in
  * @param pBuf string buffer to print (null terminated)
  */
-void debug_print_string(u16 line, u16 row, u8 color, char* pBuf);
+void debug_print_string(u16 line, u16 row, u8 color, char *pBuf);
 
 /**
  * @brief build power
  * @param color color to set to
  */
 void debug_set_bg(u16 color) {
-    u16* bgc = (u16*) 0x020375f8;
+    u16 *bgc = (u16 *)0x020375f8;
     *bgc = color;
     return;
 }
 /* === STATIC STRUCTURES === */
 
 static struct bg_config debug_bg_config[4] = {
-    {0, 0, 0x19, 0, 0, 0},
-    {1, 1, 0x1A, 0, 0, 1},
-    {2, 2, 0x1B, 0, 0, 2},
-    {3, 3, 0x1C, 0, 0, 3}
-};
+    {0, 0, 0x19, 0, 0, 0}, {1, 1, 0x1A, 0, 0, 1}, {2, 2, 0x1B, 0, 0, 2}, {3, 3, 0x1C, 0, 0, 3}};
 
 /* === IMPLEMENTATIONS === */
 
-void as_assert(char* expression, char* file, int line)
-{
+void as_assert(char *expression, char *file, int line) {
     assert_global->file = file;
     assert_global->line = line;
     assert_global->expression = expression;
-    
+
     set_callback2(debug_assert_scene);
     vblank_handler_set(debug_update);
     superstate.multi_purpose_state_tracker = 0;
     set_callback2(debug_scene);
     vblank_handler_set(debug_update);
     superstate.multi_purpose_state_tracker = 0;
-    
+
     return;
 }
 
     return;
 }
 
-void debug_init_unit_test() {
-    test_speed();
-}
+void debug_init_unit_test() { test_speed(); }
 
-void debug_print_string(u16 line, u16 row, u8 color, char* pBuf) {
+void debug_print_string(u16 line, u16 row, u8 color, char *pBuf) {
     while (*pBuf) {
         debug_print_char(line, row++, *pBuf++, color);
     }
     return;
 }
 
-void debug_print(char* str) {
+void debug_print(char *str) {
     while (*str) {
-        if(print_memory->row > 29)
-        {
+        if (print_memory->row > 29) {
             print_memory->line++;
             print_memory->row = 0;
         }
         if (*str == '\n') {
             print_memory->line++;
             print_memory->row = 0;
-        } if (*str == '\xFE') {
+        }
+        if (*str == '\xFE') {
             str++;
             u8 c = *str;
             if (c > 2)
     return;
 }
 
-void debug_printf(char* str, int arg) {
+void debug_printf(char *str, int arg) {
     while (*str) {
-        if(print_memory->row > 29)
-        {
+        if (print_memory->row > 29) {
             print_memory->line++;
             print_memory->row = 0;
         }
         if (*str == '\n') {
             print_memory->line++;
             print_memory->row = 0;
-        } if (*str == '\xFE') {
+        }
+        if (*str == '\xFE') {
             str++;
             u8 c = *str;
             if (c > 2)
                 debug_int_to_char(arg, temp);
                 debug_print(temp);
             } else if (*str == 'c') {
-                char print_char = (char) (arg);
+                char print_char = (char)(arg);
                 debug_print_char(print_memory->line, print_memory->row, print_char, print_memory->color);
                 print_memory->row++;
             }
 }
 
 void debug_clean() {
-    memset((void*) 0x0600C800, 0, 0x800);
+    memset((void *)0x0600C800, 0, 0x800);
     print_memory->row = 0;
     print_memory->line = 0;
     print_memory->color = 0;
 }
 
 void debug_wait_for_btn(u16 field) {
-    volatile u16* control_io = (volatile u16*) (0x04000130);
+    volatile u16 *control_io = (volatile u16 *)(0x04000130);
     while (*control_io & field) {
     }
     return;
 }
 
-void debug_init_stage_one()
-{
+void debug_init_stage_one() {
     print_memory->row = 0;
     print_memory->line = 0;
     print_memory->color = 0;
     gpu_sync_bg_visibility_and_mode();
     debug_reset_scrolling();
     obj_delete_all();
-    memset((void*) 0x06000000, 0, 0x17fe0);
-    memset((void*) 0x020375F8, 0, 0x400);
+    memset((void *)0x06000000, 0, 0x17fe0);
+    memset((void *)0x020375F8, 0, 0x400);
 }
 
-void debug_init_stage_two()
-{
-    vram_decompress((void*) asciiTiles, (void*) 0x06000000);
-    memcpy((void*) 0x020375F8, (void*) asciiPal, 0x60);
+void debug_init_stage_two() {
+    vram_decompress((void *)asciiTiles, (void *)0x06000000);
+    memcpy((void *)0x020375F8, (void *)asciiPal, 0x60);
     debug_set_bg(0x0000);
 }
 
     union t_map_entry map_entry;
     map_entry.entry.tile = char_to_byte(character);
     map_entry.entry.pal = color;
-    u16* ptr = (u16*) (0x0600c800 + (position * 2));
+    u16 *ptr = (u16 *)(0x0600c800 + (position * 2));
     *ptr = map_entry.short_map;
     return;
 }
     obj_gpu_sprites_upload();
 }
 
-void debug_int_to_char(u32 i, char* ref) {
+void debug_int_to_char(u32 i, char *ref) {
     if (i == 0) {
         ref[0] = '0';
         return;