diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-07-16 08:32:59 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-07-16 08:32:59 +0300 |
| commit | feb2565528b60f06df0ce863f5ae8d06a3db0d36 (patch) | |
| tree | 3a1604b5bb429d58228a267d641d84258b7bba73 | |
| parent | 542b20b914446cfc9e74bee676f5e59f44121e61 (diff) | |
Match sub_0802626C
| -rw-r--r-- | asm/enemy/chuchuBoss.s | 28 | ||||
| -rw-r--r-- | src/enemy/chuchuBoss.c | 8 |
2 files changed, 8 insertions, 28 deletions
diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 30728ada..b971ec5b 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -7,34 +7,6 @@ .text - thumb_func_start sub_0802626C -sub_0802626C: @ 0x0802626C - push {lr} - ldr r2, _0802629C @ =gPauseMenuOptions - movs r1, #1 - strb r1, [r2] - ldr r2, _080262A0 @ =gUnk_080CC20C - adds r1, r0, #0 - adds r1, #0x84 - ldr r1, [r1] - ldrb r1, [r1, #3] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - ldr r0, _080262A4 @ =gPlayerEntity - ldrb r0, [r0, #0xc] - cmp r0, #0x17 - beq _08026298 - cmp r0, #0xf - beq _08026298 - bl sub_08078B48 -_08026298: - pop {pc} - .align 2, 0 -_0802629C: .4byte gPauseMenuOptions -_080262A0: .4byte gUnk_080CC20C -_080262A4: .4byte gPlayerEntity thumb_func_start sub_080262A8 sub_080262A8: @ 0x080262A8 diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 73e78bad..87ab2a3d 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -521,3 +521,11 @@ void sub_08026110(ChuchuBossEntity* this) { sub_0800445C(super); } } + +void sub_0802626C(ChuchuBossEntity* this) { + gPauseMenuOptions.disabled = 1; + gUnk_080CC20C[this->unk_84->unk_03](this); + if (gPlayerEntity.action != 23 && gPlayerEntity.action != 15) { + sub_08078B48(); + } +} |