diagonal movement testing stuff

patches/overworlds/npc_walk.asm

@@ -30,4 +30,41 @@ bxr4_npc_walk:
 .org 0x080BD308
     ldr r1, =npc_bike_hook|1
     bx r1
-.pool
+.pool
+
+.org 0x08068A8C
+    ldr r2, =little_steps_single_hook|1
+    bx r2
+.pool
+
+.org 0x08068AAC
+    ldr r2, =little_steps_double_hook|1
+    bx r2
+.pool
+
+.org 0x08068AD0
+    ldr r2, =little_steps_triple_hook|1
+    bx r2
+.pool
+
+.org 0x08068AF8
+    ldr r2, =little_steps_quad_hook|1
+    bx r2
+.pool
+
+.org 0x08068B1C
+    ldr r2, =little_steps_octa_hook|1
+    bx r2
+.pool
+
+
+
+.org 0x08063A40
+.word tile_movement_dirs
+
+.org 0x08063A68
+.word tile_movement_dirs
+
+.org 0x08063AD0
+.word tile_movement_dirs
+

src/overworld/dynamic_overworld.c

@@ -84,7 +84,7 @@ void npc_dynamic_reset() {
 void npc_dynamic_remove_entry(u8 id) {
     if (stored_palettes[id].reference_count > 0) {
         stored_palettes[id].reference_count--;
-        dprintf("npc_dynamic: removed entry #%d\n", id);
+        //dprintf("npc_dynamic: removed entry #%d\n", id);
         if (stored_palettes[id].reference_count == 0)
             stored_palettes[id].tag = 0;
     }
@@ -200,5 +200,5 @@ void npc_delete_obj_and_free_tiles_for_npc_hack(struct NpcState *state) {
     u8 pal_num = objects[state->oam_id].final_oam.palette_num;
     obj_delete_and_free(&objects[state->oam_id]);
     npc_dynamic_remove_entry(pal_num);
-    dprintf("deleted npc state at x: %d y: %d\n", state->to.x, state->to.y);
+    //dprintf("deleted npc state at x: %d y: %d\n", state->to.x, state->to.y);
 }

src/player_interaction/npc_walk.c

@@ -2,12 +2,40 @@
 
 typedef bool (*MoveCallback)(struct NpcState* npc, struct Object* obj);
 
+const struct Coords16 tile_movement_dirs[17] = {
+    { 0, 0 },   // [0] nothing
+
+    { 0, 1 },   // [1] down
+    { 0, -1 },  // [2] up
+    { -1, 0 },  // [3] left
+    { 1, 0 },   // [4] right
+
+    { -1, 1 },  // [5] down left
+    { 1, 1 },   // [6] down right
+    { -1, -1 }, // [7] up left
+    { 1, -1 },  // [8] up right
+
+    { -1, 0 },  // [9] down left (enter)
+    { 1, 0 },   // [10] down right (enter)
+    { -1, -1 }, // [11] up left (enter)
+    { 1, -1 },  // [12] up right (enter)
+
+    { -1, 1 },  // [13] down left (leave)
+    { 1, 1 },   // [14] down right (leave)
+    { -1, 0 },  // [15] up left (leave)
+    { 1, 0 },   // [16] up right (leave)
+};
+
 void npc_walk_modify_diagonal(struct NpcState* npc, struct Object* obj, u8 direction) {
-    npc->to.x = walking_directions[direction].x + npc->from.x;
-    npc->to.y = walking_directions[direction].y + npc->from.y;
+    npc->to.x = tile_movement_dirs[direction].x + npc->from.x;
+    npc->to.y = tile_movement_dirs[direction].y + npc->from.y;
+    //dprintf("npc->from.x=%d npc->from.y=%d direction=%d\n", npc->from.x, npc->from.y, direction);
+    //dprintf("npc->to.x=%d npc->to.y=%d\n", npc->to.x, npc->to.y);
     obj->priv[3] = direction;
 }
 
+// stairs to stairs
+
 bool npc_walk_mdia_ul(struct NpcState* npc, struct Object* obj) {
     npc_run_any(npc, obj, 3, 0);
     npc_walk_modify_diagonal(npc,obj,7);
@@ -22,7 +50,7 @@ bool npc_walk_mdia_ur(struct NpcState* npc, struct Object* obj) {
 
 bool npc_walk_mdia_dl(struct NpcState* npc, struct Object* obj) {
     npc_run_any(npc, obj, 3, 0);
-    npc_update_direction(npc, 3);
+    //npc_update_direction(npc, 3);
     npc_walk_modify_diagonal(npc,obj,5);
     return npc_run_is_finished(npc,obj);
 }
@@ -33,13 +61,78 @@ bool npc_walk_mdia_dr(struct NpcState* npc, struct Object* obj) {
     return npc_run_is_finished(npc,obj);
 }
 
-MoveCallback npc_walk_anim_mdia_ul[3] = {npc_walk_mdia_ul, npc_run_is_finished, npc_move_end};
-MoveCallback npc_walk_anim_mdia_ur[3] = {npc_walk_mdia_ur, npc_run_is_finished, npc_move_end};
-MoveCallback npc_walk_anim_mdia_dl[3] = {npc_walk_mdia_dl, npc_run_is_finished, npc_move_end};
-MoveCallback npc_walk_anim_mdia_dr[3] = {npc_walk_mdia_dr, npc_run_is_finished, npc_move_end};
+// enter stairs
+
+bool npc_walk_mdia_ul_enter(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 3, 0);
+    npc_walk_modify_diagonal(npc,obj,7+4);
+    return npc_run_is_finished(npc,obj);
+}
+
+bool npc_walk_mdia_ur_enter(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 4, 0);
+    npc_walk_modify_diagonal(npc,obj,8+4);
+    return npc_run_is_finished(npc,obj);
+}
+
+bool npc_walk_mdia_dl_enter(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 3, 0);
+    //npc_update_direction(npc, 3);
+    npc_walk_modify_diagonal(npc,obj,5+4);
+    return npc_run_is_finished(npc,obj);
+}
+
+bool npc_walk_mdia_dr_enter(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 4, 0);
+    npc_walk_modify_diagonal(npc,obj,6+4);
+    return npc_run_is_finished(npc,obj);
+}
+
+// leave stairs
+
+bool npc_walk_mdia_ul_leave(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 3, 0);
+    npc_walk_modify_diagonal(npc,obj,7+8);
+    return npc_run_is_finished(npc,obj);
+}
+
+bool npc_walk_mdia_ur_leave(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 4, 0);
+    npc_walk_modify_diagonal(npc,obj,8+8);
+    return npc_run_is_finished(npc,obj);
+}
+
+bool npc_walk_mdia_dl_leave(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 3, 0);
+    //npc_update_direction(npc, 3);
+    npc_walk_modify_diagonal(npc,obj,5+8);
+    return npc_run_is_finished(npc,obj);
+}
+
+bool npc_walk_mdia_dr_leave(struct NpcState* npc, struct Object* obj) {
+    npc_run_any(npc, obj, 4, 0);
+    npc_walk_modify_diagonal(npc,obj,6+8);
+    return npc_run_is_finished(npc,obj);
+}
+
+static const MoveCallback npc_walk_anim_mdia_ul[3] = {npc_walk_mdia_ul, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_ur[3] = {npc_walk_mdia_ur, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_dl[3] = {npc_walk_mdia_dl, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_dr[3] = {npc_walk_mdia_dr, npc_run_is_finished, npc_move_end};
+
+static const MoveCallback npc_walk_anim_mdia_ul_enter[3] = {npc_walk_mdia_ul_enter, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_ur_enter[3] = {npc_walk_mdia_ur_enter, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_dl_enter[3] = {npc_walk_mdia_dl_enter, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_dr_enter[3] = {npc_walk_mdia_dr_enter, npc_run_is_finished, npc_move_end};
+
+static const MoveCallback npc_walk_anim_mdia_ul_leave[3] = {npc_walk_mdia_ul_leave, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_ur_leave[3] = {npc_walk_mdia_ur_leave, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_dl_leave[3] = {npc_walk_mdia_dl_leave, npc_run_is_finished, npc_move_end};
+static const MoveCallback npc_walk_anim_mdia_dr_leave[3] = {npc_walk_mdia_dr_leave, npc_run_is_finished, npc_move_end};
+
 
 /* first new is 170 */
-const MoveCallback* npc_walk_animations[174] =
+const MoveCallback* npc_walk_animations[182] =
 {
     (MoveCallback*)0x83a6864u, (MoveCallback*)0x83a686cu, (MoveCallback*)0x83a6874u, (MoveCallback*)0x83a687cu, 
     (MoveCallback*)0x83a6a30u, (MoveCallback*)0x83a6a38u, (MoveCallback*)0x83a6a40u, (MoveCallback*)0x83a6a48u, 
@@ -84,5 +177,69 @@ const MoveCallback* npc_walk_animations[174] =
     (MoveCallback*)0x83a6a00u, (MoveCallback*)0x83a6a0cu, (MoveCallback*)0x83a6a18u, (MoveCallback*)0x83a6a24u, 
     (MoveCallback*)0x83a700cu, (MoveCallback*)0x83a7018u, (MoveCallback*)0x83a6c3cu, (MoveCallback*)0x83a6c48u, 
     (MoveCallback*)0x83a6c54u, (MoveCallback*)0x83A6C60u, npc_walk_anim_mdia_ul, npc_walk_anim_mdia_ur,
-    npc_walk_anim_mdia_dl, npc_walk_anim_mdia_dr
-};
+    npc_walk_anim_mdia_dl, npc_walk_anim_mdia_dr, npc_walk_anim_mdia_ul_enter, npc_walk_anim_mdia_ur_enter,
+    npc_walk_anim_mdia_dl_enter, npc_walk_anim_mdia_dr_enter, npc_walk_anim_mdia_ul_leave, npc_walk_anim_mdia_ur_leave,
+    npc_walk_anim_mdia_dl_leave, npc_walk_anim_mdia_dr_leave,
+};
+
+static const struct Coords16 enter_leave_table[4] = {
+    { -1, 0 },
+    { 1, 0 },
+    { -1, 0 },
+    { 1, 0 },
+};
+
+static inline void little_steps_var(struct Object *obj, u16 movement, int mult) {
+    if (movement <= 8) {
+        // normal
+        obj->pos1.x += tile_movement_dirs[movement].x * mult;
+        obj->pos1.y += tile_movement_dirs[movement].y * mult;
+    } else if (movement <= 12) {
+        dprintf("--------------\n");
+        dprintf("animation phase: %d\n", obj->priv[5]);
+        dprintf("pos2.x=%d pos2.y=%d\n", obj->pos2.x, obj->pos2.y);
+        dprintf("OLD: x=%d y=%d\n", obj->pos1.x, obj->pos1.y);
+        // enter diagonal
+        if (obj->priv[5] < 8) {
+            obj->pos1.x += enter_leave_table[movement - 9].x * mult;
+            obj->pos1.y += enter_leave_table[movement - 9].y * mult;
+        } else {
+            obj->pos1.x += tile_movement_dirs[movement - 4].x * mult;
+            obj->pos1.y += tile_movement_dirs[movement - 4].y * mult;
+        }
+        dprintf("NEW: x=%d y=%d\n", obj->pos1.x, obj->pos1.y);
+    } else {
+        dprintf("--------------\n");
+        dprintf("animation phase: %d\n", obj->priv[5]);
+        dprintf("pos2.x=%d pos2.y=%d\n", obj->pos2.x, obj->pos2.y);
+        dprintf("OLD: x=%d y=%d\n", obj->pos1.x, obj->pos1.y);
+        if (obj->priv[5] < 8) {
+            obj->pos1.x += tile_movement_dirs[movement - 8].x * mult;
+            obj->pos1.y += tile_movement_dirs[movement - 8].y * mult;
+        } else {
+            obj->pos1.x += enter_leave_table[movement - 13].x * mult;
+            obj->pos1.y += enter_leave_table[movement - 13].y * mult;
+        }
+        dprintf("NEW: x=%d y=%d\n", obj->pos1.x, obj->pos1.y);
+    }
+}
+
+void little_steps_single_hook(struct Object *obj, u16 movement) {
+    little_steps_var(obj, movement, 1);
+}
+
+void little_steps_double_hook(struct Object *obj, u16 movement) {
+    little_steps_var(obj, movement, 2);
+}
+
+void little_steps_triple_hook(struct Object *obj, u16 movement) {
+    little_steps_var(obj, movement, 3);
+}
+
+void little_steps_quad_hook(struct Object *obj, u16 movement) {
+    little_steps_var(obj, movement, 4);
+}
+
+void little_steps_octa_hook(struct Object *obj, u16 movement) {
+    little_steps_var(obj, movement, 8);
+}

src/player_interaction/sideway_stair.c

@@ -5,10 +5,25 @@
 #define BLOCK_STATE_SIDEWAY_NE 0x81
 #define BLOCK_STATE_SIDEWAY_SW 0x82
 #define BLOCK_STATE_SIDEWAY_SE 0x83
+
+#define BLOCK_STATE_SIDEWAY_NW_ENTER 0x84
+#define BLOCK_STATE_SIDEWAY_NE_ENTER 0x85
+#define BLOCK_STATE_SIDEWAY_SW_ENTER 0x86
+#define BLOCK_STATE_SIDEWAY_SE_ENTER 0x87
+
+#define BLOCK_STATE_SIDEWAY_NW_LEAVE 0x88
+#define BLOCK_STATE_SIDEWAY_NE_LEAVE 0x89
+#define BLOCK_STATE_SIDEWAY_SW_LEAVE 0x8A
+#define BLOCK_STATE_SIDEWAY_SE_LEAVE 0x8B
+
 #define BEHAVIOR_STAIR_WEST 0xE0
 #define BEHAVIOR_STAIR_EAST 0xE1
 
-const u8 diagonal_animations[4] = {170,171,172,173};
+const u8 diagonal_animations[12] = {
+    170,171,172,173,
+    174,175,176,177,
+    178,179,180,181,
+};
 
 bool npc_sideway_try_walking(u8 block_state)
 {
@@ -20,62 +35,119 @@ bool npc_sideway_try_walking(u8 block_state)
     return false;
 }
 
+static void invalid_stair_layout(void) {
+    dprintf("invalid stair layout! please fix map data!\n");
+    while (1);
+}
+
 u8 npc_get_walkable_status(struct NpcState *npc, u16 x, u16 y, enum Direction direction, u8 roleTo) {
     dprintf("get_walkable: %d, %d, %d, %d\n", x,y, direction, roleTo);
-    u8 block = npc_block_way(npc, x,y,direction);
 
     //check for diagonal stair stuff here
-    struct NpcState dummyNpc;
-    memcpy(&dummyNpc, npc, sizeof(struct NpcState));
+    struct NpcState dummyNpc = *npc;
+
+    int fx = npc->from.x, fy = npc->from.y;
+
+    int roleFrom = cur_mapdata_block_role_at(fx, fy);
 
-    u16 roleFrom = cur_mapdata_block_role_at(npc->from.x, npc->from.y);
     if (direction == WEST) {
-        dprintf("WEST with from: %d\n", roleFrom);
-        if(roleFrom == BEHAVIOR_STAIR_WEST) {
-            
-            //walk up the stair to the west
-            dummyNpc.from.y--;
-            dummyNpc.to.y--;
-            u8 altBlocked = npc_block_way(&dummyNpc, x,y-1, direction);
-            dprintf("trying NW: %d\n", altBlocked);
-            u8 roleStairTo = cur_mapdata_block_role_at(x, y-1);
-            if(roleStairTo == BEHAVIOR_STAIR_WEST)
+        if (roleFrom == BEHAVIOR_STAIR_WEST) {
+            int roleTo = cur_mapdata_block_role_at(fx - 1, fy);
+            if (roleTo == BEHAVIOR_STAIR_WEST) {
+                dprintf("walk north west / up left\n");
+                dummyNpc.from.y--;
+                dummyNpc.to.y--;
+                int altBlocked = npc_block_way(&dummyNpc, fx - 1, fy - 1, direction);
                 return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NW : altBlocked;
-        }
-        else if(roleFrom == BEHAVIOR_STAIR_EAST){
-            //walk down the stair to the west
-            dummyNpc.from.y++;
-            dummyNpc.to.y++;
-            u8 altBlocked = npc_block_way(&dummyNpc, x,y+1, direction);
-            dprintf("trying SW: %d\n", altBlocked);
-            u8 roleStairTo = cur_mapdata_block_role_at(x, y+1);
-            if(roleStairTo == BEHAVIOR_STAIR_EAST)
+            } else if (roleTo == BEHAVIOR_STAIR_EAST) {
+                invalid_stair_layout();
+            } else {
+                dprintf("leave north west / up left\n");
+                int altBlocked = npc_block_way(&dummyNpc, fx - 1, fy, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NW_LEAVE : altBlocked;
+            }
+        } else if (roleFrom == BEHAVIOR_STAIR_EAST) {
+            int roleTo = cur_mapdata_block_role_at(fx - 1, fy + 1);
+            if (roleTo == BEHAVIOR_STAIR_WEST) {
+                invalid_stair_layout();
+            } else if (roleTo == BEHAVIOR_STAIR_EAST) {
+                dprintf("walk south west / down left\n");
+                dummyNpc.from.y++;
+                dummyNpc.to.y++;
+                int altBlocked = npc_block_way(&dummyNpc, fx - 1, fy + 1, direction);
                 return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SW : altBlocked;
+            } else {
+                dprintf("leave south west / down left\n");
+                dummyNpc.from.y++;
+                dummyNpc.to.y++;
+                int altBlocked = npc_block_way(&dummyNpc, fx - 1, fy + 1, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SW_LEAVE : altBlocked;
+            }
+        } else {
+            int roleTo = cur_mapdata_block_role_at(fx - 1, fy);
+            if (roleTo == BEHAVIOR_STAIR_WEST) {
+                dprintf("enter north west / up left\n");
+                dummyNpc.from.y--;
+                dummyNpc.to.y--;
+                int altBlocked = npc_block_way(&dummyNpc, fx - 1, fy - 1, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NW_ENTER : altBlocked;
+            } else if (roleTo == BEHAVIOR_STAIR_EAST) {
+                dprintf("enter south west / down left\n");
+                int altBlocked = npc_block_way(&dummyNpc, fx - 1, fy, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SW_ENTER : altBlocked;
+            }
         }
-    } else if(direction == EAST) {
-        if(roleFrom == BEHAVIOR_STAIR_EAST) {
-            //walk up the stair to the east
-            dummyNpc.from.y--;
-            dummyNpc.to.y--;
-            u8 altBlocked = npc_block_way(&dummyNpc, x,y-1, direction);
-            dprintf("trying NE: %d\n", altBlocked);
-            u8 roleStairTo = cur_mapdata_block_role_at(x, y-1);
-            dprintf("x: %d, y: %d, roleStairTo: %d\n",x, dummyNpc.to.y, roleStairTo);
-            if(roleStairTo == BEHAVIOR_STAIR_EAST)
-                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NE : altBlocked;
-
-        } else if (roleFrom == BEHAVIOR_STAIR_WEST) {
-            //walk down the stair to the east
-            dummyNpc.from.y++;
-            dummyNpc.to.y++;
-            u8 altBlocked = npc_block_way(&dummyNpc, x,y+1, direction);
-            dprintf("trying SW: %d\n", altBlocked);
-            u8 roleStairTo = cur_mapdata_block_role_at(x, y+1);
-            if(roleStairTo == BEHAVIOR_STAIR_WEST)
+    } else if (direction == EAST) {
+        if (roleFrom == BEHAVIOR_STAIR_WEST) {
+            int roleTo = cur_mapdata_block_role_at(fx + 1, fy + 1);
+            if (roleTo == BEHAVIOR_STAIR_WEST) {
+                dprintf("walk south east / down right\n");
+                dummyNpc.from.y++;
+                dummyNpc.to.y++;
+                int altBlocked = npc_block_way(&dummyNpc, fx + 1, fy + 1, direction);
                 return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SE : altBlocked;
+            } else if (roleTo == BEHAVIOR_STAIR_EAST) {
+                invalid_stair_layout();
+            } else {
+                dprintf("leave south east / down right\n");
+                dummyNpc.from.y++;
+                dummyNpc.to.y++;
+                int altBlocked = npc_block_way(&dummyNpc, fx + 1, fy + 1, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SE_LEAVE : altBlocked;
+            }
+        } else if (roleFrom == BEHAVIOR_STAIR_EAST) {
+            int roleTo = cur_mapdata_block_role_at(fx + 1, fy);
+            if (roleTo == BEHAVIOR_STAIR_WEST) {
+                invalid_stair_layout();
+            } else if (roleTo == BEHAVIOR_STAIR_EAST) {
+                dprintf("walk north east / up right\n");
+                dummyNpc.from.y--;
+                dummyNpc.to.y--;
+                int altBlocked = npc_block_way(&dummyNpc, fx + 1, fy - 1, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NE : altBlocked;
+            } else {
+                dprintf("leave north east / up right\n");
+                int altBlocked = npc_block_way(&dummyNpc, fx + 1, fy, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NE_LEAVE : altBlocked;
+            }
+        } else {
+            int roleTo = cur_mapdata_block_role_at(fx + 1, fy);
+            if (roleTo == BEHAVIOR_STAIR_WEST) {
+                dprintf("enter south east / down right\n");
+                int altBlocked = npc_block_way(&dummyNpc, fx + 1, fy, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SE_ENTER : altBlocked;
+            } else if (roleTo == BEHAVIOR_STAIR_EAST) {
+                dprintf("enter north east / up right\n");
+                dummyNpc.from.y--;
+                dummyNpc.to.y--;
+                int altBlocked = npc_block_way(&dummyNpc, fx + 1, fy - 1, direction);
+                return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_NE_ENTER : altBlocked;
+            }
         }
     }
 
+    u8 block = npc_block_way(npc, x,y,direction);
+
     //continue with game code
 
     if(block == 3 && npc_is_passable_maybe(x,y,direction))