fixed some wild pokemon

src/include/types.h

@@ -14,6 +14,8 @@ typedef     signed long long int    s64;
 typedef     float                   f32;
 typedef     double                  f64;
 
+#define NULL 0x00000000
+
 #include <stddef.h>
 #include <stdbool.h>
 

src/player_interaction/on_step.S

@@ -36,12 +36,11 @@ on_step:
 	bl check_block_role
 	lsl r0, #0x18
 	lsr r0, #0x18
-	ldr r1, behavior_walk_table
+	ldr r1, =behavior_walk_table
 	lsl r0, #2
 	add r0, r1
 	ldr r0, [r0]
 	mov r2, #0
-	sub r2, #1
 	cmp r0, r2
 	beq check_walking_script
 	
@@ -56,7 +55,7 @@ check_walking_script:
 	cmp r0, #0
 	beq return_false
 	sub r0, #1
-	ldr r1, script_walk_table
+	ldr r1, =script_walk_table
 	lsl r0, #2
 	add r0, r1
 	ldr r0, [r0]
@@ -101,11 +100,4 @@ read_flag:
 	
 execute_script:
 	ldr r3, =0x08069AE4|1
-	bx r3
-
-.align 2
-behavior_walk_table:
-	.word 0x09700B20
-
-script_walk_table:
-	.word 0x09700F20
+	bx r3

src/player_interaction/player_interaction.c

@@ -0,0 +1,109 @@
+/****************************************************************************
+ * 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 player_interaction.c
+ * @author Sturmvogel
+ * @date 21 may 2017
+ * @brief define tables for walking and behavior scripts
+ */
+
+#include <types.h>
+
+void* script_walk_table[] =
+{
+    (void*)NULL
+};
+
+void* behavior_walk_table[] =
+{
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)0x0891B807,
+    (void*)0x0891B807
+};
+
+//TODO implement actual functtions
+
+void* pi_dummy(bool darg)
+{
+    return darg ? behavior_walk_table[0] : script_walk_table[0];
+}

src/specials/check_tileset.c

@@ -37,8 +37,8 @@ void sp_check_tileset(void)
     u16 x;
     u16 y;
     player_get_pos_to(&x, &y);
-    dprintf("reading from %d %d\n", x,y);
+    dprintf("sp_check_tileset: reading from %d %d\n", x,y);
     u16 block_id = current_map_block_id_at(x,y);
-    dprintf("block id: %d\n", block_id);
+    dprintf("sp_check_tileset: block id: %d\n", block_id);
     var_set(0x800D, current_map_block_id_at(x,y));
 }