laid foundation for adding new grass animations (and oe_script stuff)

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "filesystem": "cpp",
+        "regex": "cpp"
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,20 @@
+{
+    "version": "0.1.0",
+    "command": "make",
+    "isShellCommand": true,
+    "args": [],
+    "showOutput": "always",
+    "echoCommand": true,
+    "suppressTaskName": true,
+    "tasks": [
+        {
+            "isBuildCommand": true,
+            "taskName": "build",
+            "args": ["-j4", "all"]
+        },
+        {
+            "taskName": "clean",
+            "args": ["clean"]
+        }
+    ]
+}

bpre.sym

@@ -104,6 +104,7 @@ fade_controller = 0x02037AB8;
 npc_states = 0x02036E38;
 
 sav_one = 0x03005008;
+oe_exec = 0x08083444|1;
 
 weather_turns = 0x02023F48;
 
@@ -191,6 +192,10 @@ current_map_music_set = 0x08071A74|1;
 current_map_music_set_to_zero = 0x08071A44|1;
 current_map_music_fadeout = 0x08071AB4|1;
 
+current_map_block_role_get = 0x08058F78|1;
+
+current_oe_state = 0x020386E0;
+
 __aeabi_idiv = 0x081E4018|1;
 __aeabi_idivmod = 0x081E40F4|1;
 __aeabi_uidiv = 0x081E460C|1;

data/raw_defines.s

@@ -10,6 +10,10 @@ objects:
 evolutions:
     .word 0x08259754
 
+.global save_one
+save_one:
+    .word 0x03005008
+
 .global ts_pals
 ts_pals:
     .incbin "sots-private/assets/misc/title/pal.bin"

makefile

@@ -6,6 +6,7 @@ CC      := arm-none-eabi-gcc
 ARS     := armips
 MAKE    := make
 NM      := @arm-none-eabi-nm
+VBA		:= vba
 LAN	:= de
 STRAGB	:= string2agb
 
@@ -125,3 +126,6 @@ $(LIST_AR):
 .PHONY: $(CRY_AR)
 $(CRY_AR):
 	$(MAKE) -C $(dir $@) all
+
+run: rom
+	$(VBA) "build/pkmn_sots.gba"

nbproject/configurations.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="100">
+<configurationDescriptor version="97">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
       <df name="sots-private">
@@ -69,6 +69,8 @@
             </df>
             <in>ascii.c</in>
           </df>
+          <in>npc.h</in>
+          <in>save_one.h</in>
         </df>
         <df name="interface">
           <in>textbox_mugshots.c</in>
@@ -174,7 +176,6 @@
         <compilerSet>Cygwin|Cygwin</compilerSet>
         <dependencyChecking>false</dependencyChecking>
         <rebuildPropChanged>false</rebuildPropChanged>
-        <prependToolCollectionPath>false</prependToolCollectionPath>
       </toolsSet>
       <flagsDictionary>
         <element flagsID="0" commonFlags="-g -march=armv4t -O3 -std=c99"/>
@@ -621,6 +622,10 @@
         <cTool flags="0">
         </cTool>
       </item>
+      <item path="src/include/npc.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="src/include/save_one.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/interface/textbox_mugshots.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
         </cTool>

nbproject/private/private.xml

@@ -18,6 +18,17 @@
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/grass_animation.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/oe_animation.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/raw_defines.s</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/game_engine.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/save_one.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/npc.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/types.h</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/specials/load_text_special.c</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/overworld.asm</file>
+        </group>
     </open-files>
 </project-private>

patches/overworlds/overworld.asm

@@ -89,4 +89,14 @@ strb r0, [r4, #0x1A]
 
 .org 0x0805F4BA
     lsl r0, #0x10
-    lsr r1, r0, #0x10
+    lsr r1, r0, #0x10
+
+.org 0x0806837C
+    ldr r3, =grass_step_general+1
+    bx r3
+    .pool
+
+.org 0x080683C8
+    ldr r3, =grass_step_elastic+1
+    bx r3
+    .pool

src/evolution/evolution_methods.c

@@ -36,9 +36,13 @@
 #include <pokemon.h>
 #include <pkmn_types.h>
 
-#define EVO_NULL {0,0,0, {false, 0}}
+#define EVO_NULL              \
+    {                         \
+        0, 0, 0, { false, 0 } \
+    }
 #define MAX_EVOLUTIONS 5
-#define EVO_NO_EVO (struct evo_result){false,false,0}
+#define EVO_NO_EVO \
+    (struct evo_result) { false, false, 0 }
 
 #define HAPPY_BOUND 219
 #define BEAUTY_BOUND 170
@@ -68,7 +72,7 @@
 #define EVO_LEVEL_VAR 21
 #define EVO_LEVEL_MOVE 22
 #define EVO_LEVEL_POKEMON 23
-#define EVO_LEVEL_TYPE  24
+#define EVO_LEVEL_TYPE 24
 #define EVO_LEVEL_MOVE_TYPE 25
 #define EVO_MEGA_ONE 26
 #define EVO_MEGA_TWO 27
@@ -89,8 +93,8 @@ struct evo_information
     u16 evolve_to;
     struct
     {
-        u16 gender: 2;
-        u16 versatile: 14;
+        u16 gender : 2;
+        u16 versatile : 14;
     } argument_2;
 };
 
@@ -102,9 +106,9 @@ struct evo_result
 };
 
 struct evo_information evolutions[][MAX_EVOLUTIONS] = {
-    {EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL},               //Nothing
-    {{EVO_LEVEL_MOVE_TYPE,7,20,{GENDER_DC, TYPE_GRASS}},EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL},   //BISASAM
-    {{EVO_LEVEL_UP,32,3,{GENDER_DC, 0}},EVO_NULL,EVO_NULL,EVO_NULL,EVO_NULL},//BISAKNOSP
+    {EVO_NULL, EVO_NULL, EVO_NULL, EVO_NULL, EVO_NULL},                                              //Nothing
+    {{EVO_LEVEL_MOVE_TYPE, 7, 20, {GENDER_DC, TYPE_GRASS}}, EVO_NULL, EVO_NULL, EVO_NULL, EVO_NULL}, //BISASAM
+    {{EVO_LEVEL_UP, 32, 3, {GENDER_DC, 0}}, EVO_NULL, EVO_NULL, EVO_NULL, EVO_NULL},                 //BISAKNOSP
 };
 
 struct evo_call_arguments
@@ -113,7 +117,7 @@ struct evo_call_arguments
     u16 level;
     enum evo_source source;
     u16 stoneId;
-    struct pokemon* poke;
+    struct pokemon *poke;
     struct evo_information evolution;
 };
 
@@ -124,18 +128,18 @@ struct evo_result evolve_by_level(struct evo_call_arguments arguments)
     u8 gender = pokemon_get_gender(arguments.poke);
     u8 gender_arg = arguments.evolution.argument_2.gender;
     dprintf("A pokemon with gender value %d\n", gender);
-    if(gender_arg == 1)
+    if (gender_arg == 1)
     {
-        if(gender)
+        if (gender)
             return EVO_NO_EVO;
     }
-    if(gender_arg == 2)
+    if (gender_arg == 2)
     {
-        if(!gender)
+        if (!gender)
             return EVO_NO_EVO;
     }
-    
-    if(arguments.evolution.argument <= arguments.level && arguments.source == LEVEL_UP)
+
+    if (arguments.evolution.argument <= arguments.level && arguments.source == LEVEL_UP)
     {
         return (struct evo_result){true, false, arguments.evolution.evolve_to};
     }
@@ -147,31 +151,31 @@ struct evo_result evolve_by_level(struct evo_call_arguments arguments)
 
 struct evo_result evolve_by_trade_group(struct evo_call_arguments arguments)
 {
-    if(arguments.source != TRADE)
+    if (arguments.source != TRADE)
     {
         return EVO_NO_EVO;
     }
-    if(arguments.evolution.method == EVO_TRADE_ITEM)
+    if (arguments.evolution.method == EVO_TRADE_ITEM)
     {
-        if(arguments.item != arguments.evolution.argument)
+        if (arguments.item != arguments.evolution.argument)
             return (struct evo_result){false, false, 0};
         else
-            return (struct evo_result){true,true, arguments.evolution.evolve_to};
+            return (struct evo_result){true, true, arguments.evolution.evolve_to};
     }
-    else if(arguments.evolution.method == EVO_TRADE)
+    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};
+        return (struct evo_result){false, false, 0};
     }
 }
 
 struct evo_result evolve_random(struct evo_call_arguments arguments)
-{  
-    if(arguments.source != LEVEL_UP)
+{
+    if (arguments.source != LEVEL_UP)
     {
         return EVO_NO_EVO;
     }
@@ -179,16 +183,16 @@ struct evo_result evolve_random(struct evo_call_arguments arguments)
     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 (mod >= 5)
     {
-        if(arguments.evolution.method == EVO_PERSO_HIGH)
+        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)
+        if (arguments.evolution.method == EVO_PERSO_LOW)
             return (struct evo_result){true, false, arguments.evolution.evolve_to};
         else
             return EVO_NO_EVO;
@@ -199,29 +203,29 @@ struct evo_result evolve_by_stone(struct evo_call_arguments arguments)
 {
     u8 gender = pokemon_get_gender(arguments.poke);
     u8 gender_arg = arguments.evolution.argument_2.gender;
-    
-    if(gender_arg == 1)
+
+    if (gender_arg == 1)
     {
-        if(gender)
+        if (gender)
             return EVO_NO_EVO;
     }
-    if(gender_arg == 2)
+    if (gender_arg == 2)
     {
-        if(!gender)
+        if (!gender)
             return EVO_NO_EVO;
     }
 
-    if(arguments.source != STONE_EVOLUTION && arguments.source != STONE_REQUEST)
+    if (arguments.source != STONE_EVOLUTION && arguments.source != STONE_REQUEST)
     {
-        return (struct evo_result){false,false, 0};
+        return (struct evo_result){false, false, 0};
     }
-    if(arguments.stoneId == arguments.evolution.argument)
+    if (arguments.stoneId == arguments.evolution.argument)
     {
         return (struct evo_result){true, false, arguments.evolution.evolve_to};
     }
     else
     {
-        return (struct evo_result){false,false,0};
+        return (struct evo_result){false, false, 0};
     }
 }
 
@@ -230,17 +234,17 @@ struct evo_result evolve_by_pokemon(struct evo_call_arguments arguments)
     u8 has_required_pokemon = false;
     u16 species_required = arguments.evolution.argument_2.versatile;
     dprintf("Required: %d\n", species_required);
-    for(int i = 0; i < 6; ++i)
+    for (int i = 0; i < 6; ++i)
     {
         u16 current_species = pokemon_get_attribute(&(pokemon_party_player[i]), ATTR_SPECIES, NULL);
         dprintf("Found pkmn: %d\n", current_species);
-        if(current_species == species_required)
+        if (current_species == species_required)
         {
             has_required_pokemon = true;
             break;
         }
     }
-    if(!has_required_pokemon)
+    if (!has_required_pokemon)
         return EVO_NO_EVO;
     return evolve_by_level(arguments);
 }
@@ -249,27 +253,26 @@ 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 (arguments.evolution.method == EVO_ATK)
     {
-        if(atk > def)
+        if (atk > def)
             return evolve_by_level(arguments);
         else
             return EVO_NO_EVO;
     }
-    if(arguments.evolution.method == EVO_DEF)
+    if (arguments.evolution.method == EVO_DEF)
     {
-        if(def > atk)
+        if (def > atk)
             return evolve_by_level(arguments);
         else
             return EVO_NO_EVO;
     }
-    if(arguments.evolution.method == EVO_ADEQU)
+    if (arguments.evolution.method == EVO_ADEQU)
     {
-        if(atk == def)
+        if (atk == def)
             return evolve_by_level(arguments);
         else
             return EVO_NO_EVO;
@@ -283,21 +286,21 @@ struct evo_result evolve_by_type(struct evo_call_arguments arguments)
     u8 has_required_pokemon = false;
     u16 type_required = arguments.evolution.argument_2.versatile;
     dprintf("Required: %d\n", type_required);
-    for(int i = 0; i < 6; ++i)
+    for (int i = 0; i < 6; ++i)
     {
         u16 current_species = pokemon_get_attribute(&(pokemon_party_player[i]), ATTR_SPECIES, NULL);
-        if(current_species == 0)
+        if (current_species == 0)
             continue;
         u8 type_one = pokemon_stats[current_species].type_one;
         u8 type_two = pokemon_stats[current_species].type_two;
         dprintf("Found type: %d/%d\n", type_one, type_two);
-        if(type_one == type_required || type_two == type_required)
+        if (type_one == type_required || type_two == type_required)
         {
             has_required_pokemon = true;
             break;
         }
     }
-    if(!has_required_pokemon)
+    if (!has_required_pokemon)
         return EVO_NO_EVO;
     return evolve_by_level(arguments);
 }
@@ -307,13 +310,13 @@ 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))
+    if ((happiness > HAPPY_BOUND) && (arguments.source == LEVEL_UP))
     {
-        return (struct evo_result){true,false,arguments.evolution.evolve_to};
+        return (struct evo_result){true, false, arguments.evolution.evolve_to};
     }
     else
     {
-        return (struct evo_result){false,false,0};
+        return (struct evo_result){false, false, 0};
     }
 }
 
@@ -321,7 +324,7 @@ struct evo_result evolve_by_special_place(struct evo_call_arguments arguments)
 {
     u16 value = var_get(EVO_VAR);
     dprintf("A pokemon tried to evolve using the var evo method: value: %d needed: %d\n", value, arguments.evolution.argument_2.versatile);
-    if(arguments.evolution.argument_2.versatile != value)
+    if (arguments.evolution.argument_2.versatile != value)
     {
         return EVO_NO_EVO;
     }
@@ -332,22 +335,22 @@ 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)
+    if (beauty > BEAUTY_BOUND && arguments.source == LEVEL_UP)
         return evolve_by_level(arguments);
     return EVO_NO_EVO;
 }
 
 struct evo_result evolve_by_worn_item(struct evo_call_arguments arguments)
 {
-    
+
     struct evo_result level_result = evolve_by_level(arguments);
-    if(!level_result.can_evolve)
+    if (!level_result.can_evolve)
         return EVO_NO_EVO;
     u16 item_to_wear = arguments.evolution.argument_2.versatile;
     dprintf("A pokemon tried to evolve by item. pkmn_item: %d; argument item: %d", arguments.item, item_to_wear);
-    if(arguments.item != item_to_wear)
+    if (arguments.item != item_to_wear)
         return EVO_NO_EVO;
-    
+
     return (struct evo_result){true, false, arguments.evolution.evolve_to};
 }
 
@@ -371,7 +374,7 @@ struct evo_result evolve_by_move(struct evo_call_arguments arguments)
     u16 move_four = pokemon_get_attribute(arguments.poke, ATTR_ATTACK_4, NULL);
     u16 move_needed = arguments.evolution.argument_2.versatile;
     dprintf("A pokemon tried to evolve using evolve_by_move: needed: %d, one: %d, two: %d, three: %d, four: %d\n", move_needed, move_one, move_two, move_three, move_four);
-    if((move_one == move_needed) || (move_two == move_needed) || (move_three == move_needed) || (move_four == move_needed))
+    if ((move_one == move_needed) || (move_two == move_needed) || (move_three == move_needed) || (move_four == move_needed))
         return evolve_by_level(arguments);
     else
         return EVO_NO_EVO;
@@ -381,20 +384,20 @@ struct evo_result evolve_by_move_type(struct evo_call_arguments arguments)
 {
     u16 needed_type = arguments.evolution.argument_2.versatile;
     u8 knows_required_move = false;
-    for(int i = ATTR_ATTACK_1; i <= ATTR_ATTACK_4; ++i)
+    for (int i = ATTR_ATTACK_1; i <= ATTR_ATTACK_4; ++i)
     {
         u16 current_move = pokemon_get_attribute(arguments.poke, i, NULL);
-        if(current_move == 0)
+        if (current_move == 0)
             continue;
         u8 current_type = move_table[current_move].type;
         dprintf("found move type: %d on move %d\n", current_type, current_move);
-        if(current_type == needed_type)
+        if (current_type == needed_type)
         {
             knows_required_move = true;
             break;
         }
     }
-    if(knows_required_move)
+    if (knows_required_move)
         return evolve_by_level(arguments);
     else
         return EVO_NO_EVO;
@@ -413,67 +416,67 @@ struct evo_result evolve_invalid_method(struct evo_call_arguments arguments)
 }
 
 static evolution_callback evolution_methods[] =
-{
-    evolve_invalid_method,                            //Method 0 INVALID
-    evolve_by_happiness,                              //Method 1
-    evolve_invalid_method, //TODO: Happiness DAY        Method 2
-    evolve_invalid_method, //TODO: Happiness NIGHT      Method 3
-    evolve_by_level,                                  //Method 4
-    evolve_by_trade_group,                            //Method 5
-    evolve_by_trade_group,                            //Method 6
-    evolve_by_stone,                                  //Method 7
-    evolve_by_atk_def,                                //Method 8
-    evolve_by_atk_def,                                //Method 9
-    evolve_by_atk_def,                                //Method 10
-    evolve_random,                                    //Method 11
-    evolve_random,                                    //Method 12
-    evolve_by_level,   //Shedninja SPAWN                Method 13
-    evolve_no_method, //Shedninja SPAWNED             //Method 14
-    evolve_by_beauty,                                 //Method 15
-    evolve_by_worn_item,                              //Method 16
-    evolve_by_worn_item_day, //TODO implement day       Method 17
-    evolve_by_worn_item_night, //TODO implement night   Method 18
-    evolve_invalid_method, //TODO implement level night Method 19
-    evolve_invalid_method, //TODO implement level day   Method 20
-    evolve_by_special_place,                          //Method 21
-    evolve_by_move,                                   //Method 22
-    evolve_by_pokemon,                                //Method 23
-    evolve_by_type,                                   //Method 24
-    evolve_by_move_type,                              //Method 25
-    evolve_no_method,                                 //Method 26
-    evolve_no_method,                                 //Method 26
-    evolve_no_method,                                 //Method 26
-    evolve_no_method,                                 //Method 26
+    {
+        evolve_invalid_method,     //Method 0 INVALID
+        evolve_by_happiness,       //Method 1
+        evolve_invalid_method,     //TODO: Happiness DAY        Method 2
+        evolve_invalid_method,     //TODO: Happiness NIGHT      Method 3
+        evolve_by_level,           //Method 4
+        evolve_by_trade_group,     //Method 5
+        evolve_by_trade_group,     //Method 6
+        evolve_by_stone,           //Method 7
+        evolve_by_atk_def,         //Method 8
+        evolve_by_atk_def,         //Method 9
+        evolve_by_atk_def,         //Method 10
+        evolve_random,             //Method 11
+        evolve_random,             //Method 12
+        evolve_by_level,           //Shedninja SPAWN                Method 13
+        evolve_no_method,          //Shedninja SPAWNED             //Method 14
+        evolve_by_beauty,          //Method 15
+        evolve_by_worn_item,       //Method 16
+        evolve_by_worn_item_day,   //TODO implement day       Method 17
+        evolve_by_worn_item_night, //TODO implement night   Method 18
+        evolve_invalid_method,     //TODO implement level night Method 19
+        evolve_invalid_method,     //TODO implement level day   Method 20
+        evolve_by_special_place,   //Method 21
+        evolve_by_move,            //Method 22
+        evolve_by_pokemon,         //Method 23
+        evolve_by_type,            //Method 24
+        evolve_by_move_type,       //Method 25
+        evolve_no_method,          //Method 26
+        evolve_no_method,          //Method 26
+        evolve_no_method,          //Method 26
+        evolve_no_method,          //Method 26
 };
 
-u16 evolution_try_evolve(struct pokemon* pokemon, enum evo_source source, u16 stoneId)
+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);
     dprintf("Species %d tried to evolve.\n", species);
     dprintf("Cause: %d\n", source);
-    if(species > 2)
+    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_information *current_evolution_structure = evolutions[species];
     struct evo_result result;
-    for(int i = 0; i < MAX_EVOLUTIONS; ++i)
+    for (int i = 0; i < MAX_EVOLUTIONS; ++i)
     {
-        if(current_evolution_structure[i].method != 0)
+        if (current_evolution_structure[i].method != 0)
         {
             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)
+            if (result.can_evolve)
                 break;
         }
     }
-    if(result.can_evolve)
+    if (result.can_evolve)
     {
-        if(result.consume_item)
+        if (result.consume_item)
         {
             u16 zero = 0;
             pokemon_set_attribute(pokemon, ATTR_HELD_ITEM, &zero);

src/include/npc.h

@@ -0,0 +1,93 @@
+/****************************************************************************
+ * 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:   npc.h
+ * Author: Sturmvogel
+ *
+ * Created on May 2, 2017
+ * @brief Provides structures for NPC access
+*/
+
+#ifndef NPC_H
+#define NPC_H
+
+#include <types.h>
+        
+/* === STRUCTURES === */
+
+
+struct coords_16 {
+    u16 x;
+    u16 y;
+};
+
+struct npc_state
+{
+    u8 bitfield;
+    u8 field_1;
+    u8 field_2;
+    u8 field_3;
+    u8 oam_id;
+    u8 type_id;
+    u8 running_behavior;
+    u8 is_trainer;
+    u8 local_id;
+    u8 local_mapnumber;
+    u8 local_mapbank;
+    u8 height;
+    struct coords_16 stay_around;
+    struct coords_16 to;
+    struct coords_16 from;
+    u8 direction;
+    u8 movement_area;
+    u8 field_1A;
+    u8 oamid2;
+    u8 an_index;
+    u8 sight_distance;
+    u8 tile_to;
+    u8 tile_from;
+    u8 unknown_1;
+    u8 unknown_2;
+    u8 field_22;
+    u8 field_23;
+};
+
+
+struct npc_type {
+    u16 tiles_tag;
+    u16 pal_num;
+    u16 pal_tag_2;
+    u16 field_6;
+    struct coords_16 pos_neg_center;
+    u8 pal_slot_unk;
+    u8 field_D;
+    u16 pal_table;
+    u32 oam;
+    u32 field_14;
+    u32 image_anims;
+    u32 gfx_table;
+    u32 rot_scale_anims;
+};
+
+#endif /* NPC_H */
+

src/include/oe_animation.h

@@ -1,7 +1,7 @@
 #ifndef OE_ANIMATION_H
 #define OE_ANIMATION_H
 
-#include <bpre.h>
+#include <types.h>
 
 struct oe_state
 {
@@ -11,41 +11,13 @@ struct oe_state
     u32 field_C;
     u32 local_id_and_mapnumber;
     u32 local_mapbank;
-    void* sav1_location;
+    u32 sav1_location;
     u32 field_1C;
 };
 extern struct oe_state current_oe_state;
 
-struct npc_state
-{
-    u8 bitfield;
-    u8 field_1;
-    u8 field_2;
-    u8 field_3;
-    u8 oam_id;
-    u8 type_id;
-    u8 running_behavior;
-    u8 is_trainer;
-    u8 local_id;
-    u8 local_mapnumber;
-    u8 local_mapbank;
-    u8 height;
-    struct coords16 stay_around;
-    struct coords16 to;
-    struct coords16 from;
-    u8 direction;
-    u8 movement_area;
-    u8 field_1A;
-    u8 oamid2;
-    u8 an_index;
-    u8 sight_distance;
-    u8 tile_to;
-    u8 tile_from;
-    u8 unknown_1;
-    u8 unknown_2;
-    u8 field_22;
-    u8 field_23;
-};
+//TODO: find correct return type
+u32 oe_exec(u8 animation_number);
 
 #endif /* OE_ANIMATION_H */
 

src/include/save_one.h

@@ -0,0 +1,63 @@
+/****************************************************************************
+ * 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:   save_one.h
+ * Author: Sturmvogel
+ *
+ * Created on May 2, 2017
+ * @brief Provides structures for save file access
+*/
+
+#ifndef SAVE_ONE_H
+#define SAVE_ONE_H
+
+#include <types.h>
+
+/* === STRUCTURES === */
+
+/* === STRUCTURES === */
+struct lt_point
+{
+    u16 x;
+    u16 y;
+};
+
+struct lt_warpdata
+{
+    u8 bank;
+    u8 map;
+    u8 warpid;
+    u8 unknown;
+    u16 enter_x;
+    u16 enter_y;
+};
+
+struct sav_struct
+{
+    struct lt_point position;
+    struct lt_warpdata location;
+};
+
+extern struct sav_struct *sav_one;
+
+#endif /* SAVE_ONE_H */

src/overworld/grass_animation.c

@@ -1,12 +1,35 @@
-/*#include <bpre.h>
+#include <oe_animation.h>
+#include <npc.h>
+#include <save_one.h>
+#include <agb_debug.h>
 
-#include "oe_animation.h"
+extern u16 current_map_block_role_get(u16 x, u16 y);
 
-void grass_step_general(struct npc_state* npc)
+void grass_step_general(struct npc_state *npc)
 {
-    current_oe_state->to_x___local_id = npc_state->to.x;
-    current_oe_state->to_y___local_mapnumber = npc_state->to.y;
-    
+    current_oe_state.to_x___local_id = npc->to.x;
+    current_oe_state.to_y___local_mapnumber = npc->to.y;
+    current_oe_state.height_lsr_4___local_mapbank = (npc->height) >> 4;
+    current_oe_state.field_C = 2;
+    current_oe_state.local_id_and_mapnumber = (npc->local_id << 8) | (npc->local_mapnumber);
+    current_oe_state.local_mapbank = npc->local_mapbank;
+    current_oe_state.sav1_location = (((sav_one->location.map) << 8) | sav_one->location.bank);
+    current_oe_state.field_1C = 1;
+    (void)oe_exec(4);
 }
 
-void grass_step_normal()*/
+void grass_step_elastic(struct npc_state *npc)
+{
+    current_oe_state.to_x___local_id = npc->to.x;
+    current_oe_state.to_y___local_mapnumber = npc->to.y;
+    current_oe_state.height_lsr_4___local_mapbank = (npc->height) >> 4;
+    current_oe_state.field_C = 2;
+    current_oe_state.local_id_and_mapnumber = (npc->local_id << 8) | (npc->local_mapnumber);
+    current_oe_state.local_mapbank = npc->local_mapbank;
+    current_oe_state.sav1_location = (((sav_one->location.map) << 8) | sav_one->location.bank);
+    current_oe_state.field_1C = 0;
+
+    /* use variable to determine the oe animation to play */
+
+    (void)oe_exec(4);
+}

src/overworld/overworld.c

@@ -29,32 +29,11 @@
 
 /* === INCLUDES === */
 #include <game_engine.h>
+#include <npc.h>
 
 /* === DEFINES === */
-#define OW_REPLACE_VAR  0x500A
-#define OW_REPLACE_TO_VAR   0x500B
-
-/* === STRUCTURES === */
-struct ow_point {
-    u16 x;
-    u16 y;
-};
-
-struct npc_type {
-    u16 tiles_tag;
-    u16 pal_num;
-    u16 pal_tag_2;
-    u16 field_6;
-    struct ow_point pos_neg_center;
-    u8 pal_slot_unk;
-    u8 field_D;
-    u16 pal_table;
-    u32 oam;
-    u32 field_14;
-    u32 image_anims;
-    u32 gfx_table;
-    u32 rot_scale_anims;
-};
+#define OW_REPLACE_VAR 0x500A
+#define OW_REPLACE_TO_VAR 0x500B
 
 /* === PROTOTYPES === */
 /**
@@ -62,25 +41,27 @@ struct npc_type {
  * @param npc_id short npc id
  * @return pointer to corresponding npc_type structure
  */
-struct npc_type* npc_get_type(u16 npc_id);
+struct npc_type *npc_get_type(u16 npc_id);
 
 /* === EXTERN STATICS ===*/
-struct npc_type** ow_main_table;
-struct npc_type** ow_second_table;
-struct npc_type** ow_third_table;
+struct npc_type **ow_main_table;
+struct npc_type **ow_second_table;
+struct npc_type **ow_third_table;
 
 /* === IMPLEMENTATIONS === */
-struct npc_type* npc_get_type(u16 npc_id) {
+struct npc_type *npc_get_type(u16 npc_id)
+{
 
     /* Not possible in a global scope because of gcc cow magic */
-    struct npc_type** npc_tables[3] = {ow_main_table, ow_second_table, ow_third_table};
+    struct npc_type **npc_tables[3] = {ow_main_table, ow_second_table, ow_third_table};
     //struct npc_type** npc_tables[] = {ow_main_table, ow_second_table, ow_third_table};
     u8 table_id = npc_id >> 8;
     if (table_id > 2)
-        npc_id = (u8) npc_id;
+        npc_id = (u8)npc_id;
 
     u16 replace_ow = var_get(OW_REPLACE_VAR);
-    if (replace_ow > 0 && replace_ow - 1 == npc_id) {
+    if (replace_ow > 0 && replace_ow - 1 == npc_id)
+    {
         npc_id = var_get(OW_REPLACE_TO_VAR);
     }
     u8 table = (npc_id >> 8);

src/specials/load_text_special.c

@@ -34,29 +34,7 @@
 #include <types.h>
 #include <game_engine.h>
 #include <config.h>
-
-/* === STRUCTURES === */
-struct lt_point
-{
-    u16 x;
-    u16 y;
-};
-
-struct lt_warpdata
-{
-    u8 bank;
-    u8 map;
-    u8 warpid;
-    u8 unknown;
-    u16 enter_x;
-    u16 enter_y;
-};
-
-struct sav_struct
-{
-    struct lt_point position;
-    struct lt_warpdata location;
-};
+#include <save_one.h>
 
 /* === PROTOTYPES === */
 
@@ -71,7 +49,6 @@ void sp_load_text_map();
 void sp_load_text_person();
 
 /* === GLOBALS === */
-extern struct sav_struct* sav_one;
 
 char* str_invalid_text_ref;
 char***** text_lookup_table;