From df272fcd6fed73eb14adc5493f0ec50e332e0521 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 18 Jul 2022 15:54:58 +0300 Subject: [PATCH] Match sub_080277B8 --- asm/enemy/chuchuBoss.s | 36 ------------------------------------ src/enemy/chuchuBoss.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 36 deletions(-) diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 06777466..ed855d0b 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -9,42 +9,6 @@ - thumb_func_start sub_080277B8 -sub_080277B8: @ 0x080277B8 - push {r4, r5, lr} - adds r5, r0, #0 - adds r4, r1, #0 - ldr r1, [r5, #0x54] - adds r3, r1, #0 - adds r3, #0x7a - ldrh r0, [r3] - cmp r4, r0 - bls _080277DC - adds r0, r0, r2 - strh r0, [r3] - ldr r0, [r1, #0x74] - ldr r2, _080277D8 @ =0xFFFE8000 - adds r0, r0, r2 - str r0, [r1, #0x74] - b _080277F0 - .align 2, 0 -_080277D8: .4byte 0xFFFE8000 -_080277DC: - strh r4, [r3] - adds r1, #0x7c - movs r0, #8 - strb r0, [r1] - adds r0, r5, #0 - adds r0, #0x84 - ldr r1, [r0] - ldrb r0, [r1, #3] - adds r0, #1 - strb r0, [r1, #3] -_080277F0: - adds r0, r5, #0 - bl sub_080277F8 - pop {r4, r5, pc} - thumb_func_start sub_080277F8 sub_080277F8: @ 0x080277F8 push {r4, r5, r6, r7, lr} diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 43ec13fd..083963a9 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -1518,3 +1518,18 @@ void sub_080276F4(ChuchuBossEntity* this, u32 param_2, u32 param_3) { pEVar6->unk_7d = (pEVar2->unk_81 << 7) / (*(u16*)((int)pEVar2 + 0x86)) + 1; } } + +void sub_080277B8(ChuchuBossEntity* this, u32 param_2, s32 param_3) { + ChuchuBossEntity* pEVar1; + + pEVar1 = (ChuchuBossEntity*)super->child; + if (param_2 > pEVar1->unk_78.HALF_U.HI) { + pEVar1->unk_78.HALF.HI += param_3; + pEVar1->unk_74.WORD -= Q_16_16(1.5); + } else { + pEVar1->unk_78.HALF.HI = param_2; + pEVar1->unk_7c = 8; + this->unk_84->unk_03++; + } + sub_080277F8(this); +}