Skip to content

Commit

Permalink
more hook rail
Browse files Browse the repository at this point in the history
  • Loading branch information
freshollie committed Apr 30, 2023
1 parent 171abb4 commit e5439ba
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 91 deletions.
91 changes: 0 additions & 91 deletions asm/interactable_hook_rail.s
Original file line number Diff line number Diff line change
Expand Up @@ -4,97 +4,6 @@
.syntax unified
.arm

thumb_func_start sub_8072DCC
sub_8072DCC: @ 0x08072DCC
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r6, _08072E38 @ =gPlayer
ldr r0, [r6, #0x20]
movs r1, #0x80
lsls r1, r1, #0xf
orrs r0, r1
str r0, [r6, #0x20]
adds r1, r6, #0
adds r1, #0x64
movs r5, #0
movs r0, #0x37
strh r0, [r1]
adds r0, r6, #0
bl sub_80218E4
adds r0, r6, #0
movs r1, #0xe
bl sub_8023B5C
movs r0, #6
strb r0, [r6, #0x16]
movs r0, #0xe
strb r0, [r6, #0x17]
ldr r1, [r6, #0x20]
subs r0, #0x13
ands r1, r0
str r1, [r6, #0x20]
ldr r0, [r4, #4]
adds r0, #0x14
lsls r0, r0, #8
str r0, [r6, #0xc]
str r5, [r4, #0x1c]
ldrb r0, [r4, #0x10]
cmp r0, #0
bne _08072E40
movs r0, #1
orrs r1, r0
str r1, [r6, #0x20]
ldrh r0, [r6, #0x10]
strh r0, [r6, #0x14]
lsls r0, r0, #0x10
asrs r0, r0, #0x10
ldr r1, _08072E3C @ =0xFFFFFF00
cmp r0, r1
ble _08072E2E
movs r0, #0xff
lsls r0, r0, #8
strh r0, [r6, #0x14]
_08072E2E:
adds r1, r6, #0
adds r1, #0x24
movs r0, #0x80
b _08072E60
.align 2, 0
_08072E38: .4byte gPlayer
_08072E3C: .4byte 0xFFFFFF00
_08072E40:
movs r0, #2
rsbs r0, r0, #0
ands r1, r0
str r1, [r6, #0x20]
ldrh r0, [r6, #0x10]
strh r0, [r6, #0x14]
lsls r0, r0, #0x10
asrs r0, r0, #0x10
cmp r0, #0xff
bgt _08072E5A
movs r0, #0x80
lsls r0, r0, #1
strh r0, [r6, #0x14]
_08072E5A:
adds r1, r6, #0
adds r1, #0x24
movs r0, #0
_08072E60:
strb r0, [r1]
ldr r0, _08072E78 @ =0x0000011B
bl m4aSongNumStart
ldr r0, _08072E7C @ =gCurTask
ldr r1, [r0]
ldr r0, _08072E80 @ =sub_8072BB8
str r0, [r1, #8]
pop {r4, r5, r6}
pop {r0}
bx r0
.align 2, 0
_08072E78: .4byte 0x0000011B
_08072E7C: .4byte gCurTask
_08072E80: .4byte sub_8072BB8

thumb_func_start sub_8072E84
sub_8072E84: @ 0x08072E84
push {r4, r5, r6, r7, lr}
Expand Down
35 changes: 35 additions & 0 deletions src/game/interactables_2/hot_crater/hook_rail.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,38 @@ void sub_8072D40(void)
}
}
}

void sub_8072BB8(void);

void sub_8072DCC(Sprite_HookRail *hookRail)
{
gPlayer.moveState |= MOVESTATE_400000;
gPlayer.unk64 = 0x37;
sub_80218E4(&gPlayer);
sub_8023B5C(&gPlayer, 14);
gPlayer.unk16 = 6;
gPlayer.unk17 = 14;
gPlayer.moveState &= ~MOVESTATE_4;
gPlayer.y = Q_24_8(hookRail->y + 0x14);
hookRail->unk1C = 0;
if (hookRail->unk10 == 0) {
gPlayer.moveState |= MOVESTATE_FACING_LEFT;
gPlayer.speedGroundX = gPlayer.speedAirX;

if (gPlayer.speedGroundX > -Q_24_8(1)) {
gPlayer.speedGroundX = -Q_24_8(1);
}
gPlayer.rotation = 128;
} else {
gPlayer.moveState &= ~MOVESTATE_FACING_LEFT;
gPlayer.speedGroundX = gPlayer.speedAirX;
if (gPlayer.speedGroundX < Q_24_8(1)) {
gPlayer.speedGroundX = Q_24_8(1);
}

gPlayer.rotation = 0;
}

m4aSongNumStart(SE_283);
gCurTask->main = sub_8072BB8;
}

0 comments on commit e5439ba

Please sign in to comment.