started new evolution methods

.gitignore

@@ -7,3 +7,4 @@ temp
 *.mid
 *.a
 base/*.*
+nbproject/private/tools/

main.asm

@@ -35,6 +35,7 @@
 .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"
 
 .include "patches/overworlds/pkm_wild.asm"
 //.include "patches/dns/core.asm"

nbproject/configurations.xml

@@ -20,6 +20,9 @@
         <df name="overworlds">
           <in>pkm_wild.asm</in>
         </df>
+        <df name="pokemon_data">
+          <in>pokemon_evolution.asm</in>
+        </df>
         <df name="trainer_sprites">
           <in>trainer_data.asm</in>
         </df>
@@ -71,6 +74,9 @@
         <df name="encode">
           <in>crc32.c</in>
         </df>
+        <df name="evolution">
+          <in>evolution_methods.c</in>
+        </df>
         <df name="include">
           <df name="assets">
             <df name="mug">
@@ -87,6 +93,7 @@
             </df>
             <in>ascii.c</in>
           </df>
+          <in>agb_debug.h</in>
         </df>
         <df name="interface">
           <in>textbox_mugshots.c</in>
@@ -267,6 +274,11 @@
       </item>
       <item path="patches/overworlds/pkm_wild.asm" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="patches/pokemon_data/pokemon_evolution.asm"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="patches/trainer_sprites/trainer_data.asm"
             ex="false"
             tool="4"
@@ -385,6 +397,10 @@
         <cTool flags="0">
         </cTool>
       </item>
+      <item path="src/evolution/evolution_methods.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/include/agb_debug.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/include/assets/ascii.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
         </cTool>

nbproject/private/configurations.xml

@@ -5692,6 +5692,8 @@
           </df>
           <df name="encode">
           </df>
+          <df name="evolution">
+          </df>
           <df name="include">
             <df name="assets">
               <df name="mug">
@@ -5829,6 +5831,7 @@
           <in>pokedex_order.asm</in>
           <in>pokemon_back_sprites.asm</in>
           <in>pokemon_egg_moves.asm</in>
+          <in>pokemon_evolution.asm</in>
           <in>pokemon_footprints.asm</in>
           <in>pokemon_front_sprites.asm</in>
           <in>pokemon_habitats.asm</in>
@@ -6623,6 +6626,9 @@
         <df name="encode">
           <in>crc32.c</in>
         </df>
+        <df name="evolution">
+          <in>evolution_methods.c</in>
+        </df>
         <df name="include">
           <df name="assets">
             <df name="interface">
@@ -6656,6 +6662,7 @@
             <in>ascii.c</in>
             <in>ascii.h</in>
           </df>
+          <in>agb_debug.h</in>
           <in>applymovements.h</in>
           <in>attack_names.h</in>
           <in>battle_abilities.h</in>

patches/pokemon_data/pokemon_evolution.asm

@@ -0,0 +1,4 @@
+.org 0x08042EC4
+ldr r7, =evolution_try_evolve+1
+bx r7
+.pool

src/evolution/evolution_methods.c

@@ -0,0 +1,52 @@
+/****************************************************************************
+ * Copyright (C) 2015-2017 by the SotS Team                                 *
+ *                                                                          *
+ * This file is part of Sovereign of the Skies.                             *
+ *                                                                          *
+ *   Sovereign of the Skies is free software: you can redistribute it       *
+ *   and/or modify it                                                       *
+ *   under the terms of the GNU Lesser General Public License as published  *
+ *   by the Free Software Foundation, either version 3 of the License, or   *
+ *   (at your option) any later version provided you include a copy of the  *
+ *   licence and this header.                                               *
+ *                                                                          *
+ *   Sovereign of the Skies is distributed in the hope that it will be      *
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Lesser General Public License for more details.                    *
+ *                                                                          *
+ *   You should have received a copy of the GNU Lesser General Public       *
+ *   License along with Sovereign of the Skies.                             *
+ *   If not, see <http://www.gnu.org/licenses/>.                            *
+ ****************************************************************************/
+
+/**
+ * @file evolution_methods.c
+ * @author Sturmvogel
+ * @date 18 apr 2017
+ * @brief decide if a pokémon is able to evolve and what the consequences are.
+ *
+ */
+#include <game_engine.h>
+#include <pkmn_attributes.h>
+#include <agb_debug.h>
+
+enum evo_source
+{
+    LEVEL_UP,
+    TRADE,
+    STONE_EVOLUTION,
+    STONE_REQUEST
+};
+
+u16 evolution_try_evolve(struct pokemon* pokemon, enum evo_source source, u16 stoneId)
+{
+    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);
+    dprintf("Held Item: %d; Level: %d\nBlocking evolution for debug.", held_item, level);
+    return 150;
+}

src/include/agb_debug.h

@@ -0,0 +1,35 @@
+/****************************************************************************
+ * Copyright (C) 2015-2017 by the SotS Team                                 *
+ *                                                                          *
+ * This file is part of Sovereign of the Skies.                             *
+ *                                                                          *
+ *   Sovereign of the Skies is free software: you can redistribute it       *
+ *   and/or modify it                                                       *
+ *   under the terms of the GNU Lesser General Public License as published  *
+ *   by the Free Software Foundation, either version 3 of the License, or   *
+ *   (at your option) any later version provided you include a copy of the  *
+ *   licence and this header.                                               *
+ *                                                                          *
+ *   Sovereign of the Skies is distributed in the hope that it will be      *
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Lesser General Public License for more details.                    *
+ *                                                                          *
+ *   You should have received a copy of the GNU Lesser General Public       *
+ *   License along with Sovereign of the Skies.                             *
+ *   If not, see <http://www.gnu.org/licenses/>.                            *
+ ****************************************************************************/
+/* 
+ * File:   agb_debug.h
+ * Author: Sturmvogel
+ *
+ * Created on 18. April 2017, 15:25
+ */
+
+#ifndef AGB_DEBUG_H
+#define AGB_DEBUG_H
+
+void dprintf(const char * str, ...);
+
+#endif /* AGB_DEBUG_H */
+