add sideway stairs

g3headers

@@ -1 +1 @@
-Subproject commit 732e4c1cc26397d8ac95c28886d29501b0baf5b4
+Subproject commit 1063239b4b46f6e4b87978f62aee78306e1b4015

patches/overworlds/npc_walk.asm

@@ -5,4 +5,29 @@
 .word npc_walk_animations
 
 .org 0x080645B4
-.word npc_walk_animations
+.word npc_walk_animations
+
+.org 0x0805BBA8
+push {r4, lr}
+ldr r4, [sp, #8] //block role
+push {r4}
+ldr r4, =npc_get_walkable_status+1
+bl bxr4_npc_walk
+add sp, #4
+pop {r4}
+pop {r1}
+bx r1
+
+bxr4_npc_walk:
+    bx r4
+.pool
+
+.org 0x0805B9E4
+    ldr r1, =npc_run_hook|1
+    bx r1
+.pool
+
+.org 0x080BD308
+    ldr r1, =npc_bike_hook|1
+    bx r1
+.pool

src/player_interaction/sideway_stair.c

@@ -0,0 +1,80 @@
+#include <pokeagb/pokeagb.h>
+#include <agb_debug.h>
+
+#define BLOCK_STATE_SIDEWAY_NW 0x80
+#define BLOCK_STATE_SIDEWAY_NE 0x81
+#define BLOCK_STATE_SIDEWAY_SW 0x82
+#define BLOCK_STATE_SIDEWAY_SE 0x83
+#define BEHAVIOR_STAIR_WEST 0xE0
+#define BEHAVIOR_STAIR_EAST 0xE1
+
+const u8 diagonal_animations[4] = {170,171,172,173};
+
+bool npc_sideway_try_walking(u8 block_state)
+{
+    if(block_state >= BLOCK_STATE_SIDEWAY_NW) {
+        npc_player_set_movement_and_x22(diagonal_animations[block_state - BLOCK_STATE_SIDEWAY_NW], 2);
+        // Kinda have to do the thing when the player runs (ish)
+        return true;
+    }
+    return false;
+}
+
+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));
+
+    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);
+            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 SE: %d\n", altBlocked);
+            return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SW : 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);
+            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);
+            return (altBlocked == 0) ? BLOCK_STATE_SIDEWAY_SE : altBlocked;
+        }
+    }
+
+    //continue with game code
+
+    if(block == 3 && npc_is_passable_maybe(x,y,direction))
+        return 5;
+    if(npc_handle_jump(x,y,direction)) {
+        sav1_secure_increment(0x2B);
+        return 6;
+    }
+    else if(block == 4 && npc_handle_strength(x,y,direction)) {
+        return 7;
+    }
+    return block;
+}

src/player_interaction/sideway_stair_hooks.s

@@ -0,0 +1,38 @@
+.align 2
+.thumb
+.text
+.global npc_run_hook
+
+npc_run_hook:
+    //we just got our result from npc_get_walkable_status in r0
+    lsl r0, #0x18
+    lsr r0, #0x18
+    mov r6, r0
+    bl npc_sideway_try_walking
+    cmp r0, #1
+    bne continue
+walkable:
+    ldr r6, =0x0805BA18|1
+    bx r6
+continue:
+    mov r0, r6
+    mov r1, r0
+    cmp r0, #0
+    beq walkable
+    ldr r6, =0x0805B9EE|1
+    bx r6
+
+.global npc_bike_hook
+npc_bike_hook:
+    lsr r5, r0, #0x18
+    bl npc_sideway_try_walking
+    cmp r0, #0
+    beq continue_bike
+    pop {r4-r6}
+    pop {r0}
+    bx r0
+    continue_bike:
+    mov r1, r5
+    sub r0, r1, #1
+    ldr r2, =0x080BD312|1
+    bx r2