finished vanilla evolution implementation

patches/pokemon_data/pokemon_evolution.asm

@@ -1,4 +1,19 @@
 .org 0x08042EC4
 ldr r7, =evolution_try_evolve+1
 bx r7
-.pool
+.pool
+
+.org 0x08042F6C
+.word evolutions
+
+.org 0x08042FBC
+.word evolutions
+
+.org 0x08043138
+.word evolutions
+
+.org 0x0804599C
+.word evolutions
+
+.org 0x080CE8C4
+.word evolutions

src/evolution/evolution_methods.c

@@ -30,6 +30,7 @@
 #include <game_engine.h>
 #include <pkmn_attributes.h>
 #include <agb_debug.h>
+#include <math.h>
 
 enum evo_source
 {
@@ -56,13 +57,30 @@ struct evo_result
 };
 
 #define EVO_NULL {0,0,0,0,0}
+#define MAX_EVOLUTIONS 5
+#define EVO_NO_EVO (struct evo_result){false,false,0}
+
+#define HAPPY_BOUND 219
+#define BEAUTY_BOUND 170
+
+#define EVO_HAPPINESS 1
 #define EVO_LEVEL_UP 4
-#define MAX_EVOLUTIONS 3
+#define EVO_TRADE 5
+#define EVO_TRADE_ITEM 6
+#define EVO_STONE 7
+#define EVO_ATK 8
+#define EVO_DEF 9
+#define EVO_ADEQU 10
+#define EVO_PERSO_HIGH 11
+#define EVO_PERSO_LOW 12
+#define EVO_SPAWN 13
+#define EVO_SPAWNED 14
+#define EVO_BEAUTY 15
 
 struct evo_information evolutions[][MAX_EVOLUTIONS] = {
-    {EVO_NULL,EVO_NULL,EVO_NULL},
-    {{EVO_LEVEL_UP,16,2,0,0},EVO_NULL,EVO_NULL},
-    {{EVO_LEVEL_UP,32,3,0,0},EVO_NULL,EVO_NULL},
+    {EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL},               //Nothing
+    {{EVO_BEAUTY,7,2,0,0},{EVO_SPAWNED,7,150,0,0},EVO_NULL,EVO_NULL,EVO_NULL},   //BISASAM
+    {{EVO_LEVEL_UP,32,3,0,0},EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL},//BISAKNOSP
 };
 
 struct evo_call_arguments
@@ -79,24 +97,169 @@ typedef struct evo_result (*evolution_callback)(struct evo_call_arguments);
 
 struct evo_result evolve_by_level(struct evo_call_arguments arguments)
 {
-    if(arguments.source != LEVEL_UP)
+    if(arguments.evolution.argument <= arguments.level && arguments.source == LEVEL_UP)
+    {
+        return (struct evo_result){true, false, arguments.evolution.evolve_to};
+    }
+    else
+    {
+        return (struct evo_result){false, false, 0};
+    }
+}
+
+struct evo_result evolve_by_trade_group(struct evo_call_arguments arguments)
+{
+    if(arguments.source != TRADE)
     {
         return (struct evo_result){false, false, 0};
     }
-    if(arguments.evolution.argument <= arguments.level)
+    if(arguments.evolution.method == EVO_TRADE_ITEM)
+    {
+        if(arguments.item != arguments.evolution.argument)
+            return (struct evo_result){false, false, 0};
+        else
+            return (struct evo_result){true,true, arguments.evolution.evolve_to};
+    }
+    else if(arguments.evolution.method == EVO_TRADE)
+    {
+        return (struct evo_result){true, false, arguments.evolution.evolve_to};
+    }
+    else
+    {
+        dprintf("An invalid trade group method was reached in \"evolve_by_trade_group\"\nmethod: %d", arguments.evolution.method);
+        return (struct evo_result){false,false,0};
+    }
+}
+
+struct evo_result evolve_random(struct evo_call_arguments arguments)
+{
+    if(arguments.source != LEVEL_UP)
+    {
+        return EVO_NO_EVO;
+    }
+    u32 pid = pokemon_get_attribute(arguments.poke, ATTR_PID, NULL);
+    pid = pid & 0xFFFF;
+    u8 mod = __aeabi_uidivmod(pid, 10);
+    dprintf("A pokemon tries to evolve at random: pid: %d, low: %d, mod: %d\n", pid, pid, mod);
+    if(mod >= 5)
+    {
+        if(arguments.evolution.method == EVO_PERSO_HIGH)
+            return (struct evo_result){true, false, arguments.evolution.evolve_to};
+        else
+            return EVO_NO_EVO;
+    }
+    else
+    {
+        if(arguments.evolution.method == EVO_PERSO_LOW)
+            return (struct evo_result){true, false, arguments.evolution.evolve_to};
+        else
+            return EVO_NO_EVO;
+    }
+}
+
+struct evo_result evolve_by_stone(struct evo_call_arguments arguments)
+{
+    if(arguments.source != STONE_EVOLUTION && arguments.source != STONE_REQUEST)
+    {
+        return (struct evo_result){false,false, 0};
+    }
+    if(arguments.stoneId == arguments.evolution.argument)
     {
         return (struct evo_result){true, false, arguments.evolution.evolve_to};
     }
+    else
+    {
+        return (struct evo_result){false,false,0};
+    }
+}
+
+struct evo_result evolve_by_atk_def(struct evo_call_arguments arguments)
+{
+    u32 atk = pokemon_get_attribute(arguments.poke, ATTR_ATTACK, NULL);
+
+    
+    u32 def = pokemon_get_attribute(arguments.poke, ATTR_DEFENCE, NULL);
+    dprintf("A pokemon wants to evolve by atk and def.\n");
+    dprintf("Level required: %d, pkmn level: %d, pkmn atk: %d, pkmn def: %d\n", arguments.evolution.argument, arguments.level, atk, def);
+    if(arguments.evolution.method == EVO_ATK)
+    {
+        if(atk > def)
+            return evolve_by_level(arguments);
+        else
+            return EVO_NO_EVO;
+    }
+    if(arguments.evolution.method == EVO_DEF)
+    {
+        if(def > atk)
+            return evolve_by_level(arguments);
+        else
+            return EVO_NO_EVO;
+    }
+    if(arguments.evolution.method == EVO_ADEQU)
+    {
+        if(atk == def)
+            return evolve_by_level(arguments);
+        else
+            return EVO_NO_EVO;
+    }
+    dprintf("invalid atk and def evo code reached.\n");
+    return EVO_NO_EVO;
+}
+
+struct evo_result evolve_by_happiness(struct evo_call_arguments arguments)
+{
+    u32 happiness = pokemon_get_attribute(arguments.poke, ATTR_HAPPINESS, NULL);
+    dprintf("A pokemon wants to evolve by happiness.\n");
+    dprintf("Happiness value: %d; needed: %d\n", happiness, HAPPY_BOUND);
+    if((happiness > HAPPY_BOUND) && (arguments.source == LEVEL_UP))
+    {
+        return (struct evo_result){true,false,arguments.evolution.evolve_to};
+    }
+    else
+    {
+        return (struct evo_result){false,false,0};
+    }
+}
+
+struct evo_result evolve_by_beauty(struct evo_call_arguments arguments)
+{
+    u32 beauty = pokemon_get_attribute(arguments.poke, ATTR_BEAUTY, NULL);
+    dprintf("A pokemon tires to evolve by beauty: value: %d; required: %d.\n", beauty, BEAUTY_BOUND);
+    if(beauty > BEAUTY_BOUND && arguments.source == LEVEL_UP)
+        return evolve_by_level(arguments);
+    return EVO_NO_EVO;
+}
+
+struct evo_result evolve_no_method(struct evo_call_arguments arguments)
+{
+    //For shedninja
+    return EVO_NO_EVO;
+}
+
+struct evo_result evolve_invalid_method(struct evo_call_arguments arguments)
+{
+    dprintf("A pokemon tried to execute an evolution method that is not yet implemented.\n");
     return (struct evo_result){false, false, 0};
 }
 
 static evolution_callback evolution_methods[] =
 {
-    NULL,
-    NULL, //TODO: Happiness
-    NULL, //TODO: Happiness DAY
-    NULL, //TODO: Happiness NIGHT
-    evolve_by_level
+    evolve_invalid_method,
+    evolve_by_happiness,
+    evolve_invalid_method, //TODO: Happiness DAY
+    evolve_invalid_method, //TODO: Happiness NIGHT
+    evolve_by_level,
+    evolve_by_trade_group,
+    evolve_by_trade_group,
+    evolve_by_stone,
+    evolve_by_atk_def,
+    evolve_by_atk_def,
+    evolve_by_atk_def,
+    evolve_random,
+    evolve_random,
+    evolve_by_level,   //Shedninja SPAWN
+    evolve_no_method, //Shedninja SPAWNED
+    evolve_by_beauty
 };
 
 u16 evolution_try_evolve(struct pokemon* pokemon, enum evo_source source, u16 stoneId)
@@ -104,16 +267,20 @@ u16 evolution_try_evolve(struct pokemon* pokemon, enum evo_source source, u16 st
     u16 held_item = pokemon_get_attribute(pokemon, ATTR_HELD_ITEM, NULL);
     u16 species = pokemon_get_attribute(pokemon, ATTR_SPECIES, NULL);
     u16 level = pokemon_get_attribute(pokemon, ATTR_LEVEL, NULL);
-    //TODO PID
     dprintf("Species %d tried to evolve.\n", species);
     dprintf("Cause: %d\n", source);
+    if(species > 2)
+    {
+        dprintf("Currently no evolution possible due to short table!\n");
+        return 0;
+    }
     struct evo_information* current_evolution_structure = evolutions[species];
     struct evo_result result;
     for(int i = 0; i < MAX_EVOLUTIONS; ++i)
     {
         if(current_evolution_structure[i].method != 0)
         {
-            dprintf("found valid evolution with method %d for species %d", current_evolution_structure[i].method, species);
+            dprintf("found valid evolution with method %d for species %d\n", current_evolution_structure[i].method, species);
             struct evo_call_arguments args = {held_item, level, source, stoneId, pokemon, current_evolution_structure[i]};
             result = evolution_methods[current_evolution_structure[i].method](args);
             if(result.can_evolve)
@@ -124,12 +291,11 @@ u16 evolution_try_evolve(struct pokemon* pokemon, enum evo_source source, u16 st
     {
         if(result.consume_item)
         {
-            //TODO: Consume
+            u16 zero = 0;
+            pokemon_set_attribute(pokemon, ATTR_HELD_ITEM, &zero);
         }
         return result.evolve_to;
     }
     else
         return 0;
-    /*evolve everything to mewtu for jiggs & giggles*/
-    return 150;
 }

src/interface/textbox_mugshots.c

@@ -81,12 +81,7 @@ struct obj_template mugshot_2_template = {MUGSHOT_2_TAG, MUGSHOT_2_TAG, &mug_spr
 
 /* === IMPLEMENTATIONS === */
 
-void dprint(const char *sz);
-void dprintf(const char *str, ...);
-
 void mug_create_on_variable() {
-    int i = 45;
-    dprintf("Hello Test %d", i);
     u16 *mug1_var = var_access(MUGHSOT_1_TABLE);
     u16 c_mug1_var = *mug1_var;
     u16 mug_id_1 = c_mug1_var & 0x3FFF;