summaryrefslogtreecommitdiff
path: root/src/field/field_player_avatar.c
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-17 15:49:51 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-17 15:49:51 -0600
commit6efb614f3f3bf1b1b381bdfe220391e152fc8ebe (patch)
tree21281bb70514feab3d30b6d95aaec9932266b160 /src/field/field_player_avatar.c
parent6903b3626aed4e5521243b4517c43fed3c4d0ff5 (diff)
add more debug things
Diffstat (limited to 'src/field/field_player_avatar.c')
-rw-r--r--src/field/field_player_avatar.c99
1 files changed, 97 insertions, 2 deletions
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 747edf816..db674e52f 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -291,7 +291,7 @@ u8 TryDoMetatileBehaviorForcedMovement()
" lsr r0, r0, #0x16\n"
" add r0, r0, r4\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
"._26:\n"
@@ -513,7 +513,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161)
" ldr r2, [r0]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl gScriptFuncs_End+0x3cfc\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cfc\n"
"._83:\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
@@ -1855,3 +1855,98 @@ static void sub_805A954(void)
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 1, playerSprite->pos2.y);
}
+
+#if DEBUG
+__attribute__((naked))
+void debug_sub_805F2B0()
+{
+ asm(
+ " push {lr}\n"
+ " lsl r0, r0, #0x18\n"
+ " lsr r2, r0, #0x18\n"
+ " ldr r0, ._422\n"
+ " ldrh r1, [r0, #0x2c]\n"
+ " mov r0, #0x80\n"
+ " lsl r0, r0, #0x1\n"
+ " and r0, r0, r1\n"
+ " cmp r0, #0\n"
+ " bne ._420 @cond_branch\n"
+ " mov r0, #0x0\n"
+ " b ._421\n"
+ "._423:\n"
+ " .align 2, 0\n"
+ "._422:\n"
+ " .word gMain\n"
+ "._420:\n"
+ " add r0, r2, #0\n"
+ " bl debug_sub_805F2DC\n"
+ " lsl r0, r0, #0x18\n"
+ " lsr r0, r0, #0x18\n"
+ "._421:\n"
+ " pop {r1}\n"
+ " bx r1\n"
+ "\n"
+ );
+}
+
+__attribute__((naked))
+void debug_sub_805F2DC()
+{
+ asm(
+ " push {r4, lr}\n"
+ " lsl r0, r0, #0x18\n"
+ " lsr r4, r0, #0x18\n"
+ " cmp r4, #0\n"
+ " bne ._424 @cond_branch\n"
+ " ldr r2, ._426\n"
+ " ldr r0, ._426 + 4\n"
+ " ldrb r1, [r0, #0x5]\n"
+ " lsl r0, r1, #0x3\n"
+ " add r0, r0, r1\n"
+ " lsl r0, r0, #0x2\n"
+ " add r0, r0, r2\n"
+ " ldrb r0, [r0, #0x18]\n"
+ " lsr r0, r0, #0x4\n"
+ " bl PlayerFaceDirection\n"
+ " b ._430\n"
+ "._427:\n"
+ " .align 2, 0\n"
+ "._426:\n"
+ " .word gMapObjects\n"
+ " .word gPlayerAvatar\n"
+ "._424:\n"
+ " ldr r2, ._431\n"
+ " ldr r0, ._431 + 4\n"
+ " ldrb r1, [r0, #0x5]\n"
+ " lsl r0, r1, #0x3\n"
+ " add r0, r0, r1\n"
+ " lsl r0, r0, #0x2\n"
+ " add r0, r0, r2\n"
+ " ldrb r0, [r0, #0x1]\n"
+ " lsr r0, r0, #0x7\n"
+ " cmp r0, #0\n"
+ " beq ._429 @cond_branch\n"
+ " add r0, r4, #0\n"
+ " bl CanCameraMoveInDirection\n"
+ " cmp r0, #0\n"
+ " bne ._429 @cond_branch\n"
+ " add r0, r4, #0\n"
+ " bl PlayerOnBikeCollide\n"
+ " b ._430\n"
+ "._432:\n"
+ " .align 2, 0\n"
+ "._431:\n"
+ " .word gMapObjects\n"
+ " .word gPlayerAvatar\n"
+ "._429:\n"
+ " add r0, r4, #0\n"
+ " bl sub_80593F4\n"
+ "._430:\n"
+ " mov r0, #0x1\n"
+ " pop {r4}\n"
+ " pop {r1}\n"
+ " bx r1\n"
+ "\n"
+ );
+}
+#endif