falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match sub_080279AC

This commit is contained in:
Tal Hayon 2022-07-19 04:06:08 +03:00
parent 06e8f0f501
commit 27d04023f7
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
asm/enemy/chuchuBoss.s
View File

@ -12,38 +12,6 @@
thumb_func_start sub_080279AC
sub_080279AC: @ 0x080279AC
push {r4, r5, r6, lr}
mov ip, r1
movs r3, #4
subs r3, r3, r2
ldrh r1, [r1, #0x2e]
ldrh r4, [r0, #0x2e]
subs r1, r1, r4
mov r6, ip
adds r6, #0x62
strb r1, [r6]
mov r2, ip
ldrh r1, [r2, #0x32]
ldrh r2, [r0, #0x32]
adds r0, r2, r3
subs r1, r1, r0
mov r5, ip
adds r5, #0x63
strb r1, [r5]
mov r0, ip
strh r4, [r0, #0x2e]
adds r2, r2, r3
strh r2, [r0, #0x32]
ldr r1, [r0, #0x48]
ldrb r0, [r6]
strb r0, [r1]
mov r2, ip
ldr r1, [r2, #0x48]
ldrb r0, [r5]
strb r0, [r1, #1]
pop {r4, r5, r6, pc}
thumb_func_start sub_080279E8
sub_080279E8: @ 0x080279E8

12
src/enemy/chuchuBoss.c
View File

@ -1634,3 +1634,15 @@ void sub_08027984(ChuchuBossEntity* this) {
sub_080279AC(this, pEVar1, pEVar1->base.type);
sub_080279AC(this, pEVar2, pEVar2->base.type);
}
void sub_080279AC(ChuchuBossEntity* this, Entity* param_2, s32 param_3) {
s32 temp;
temp = 4 - param_3;
param_2->spriteOffsetX = param_2->x.HALF_U.HI - super->x.HALF_U.HI;
param_2->spriteOffsetY = param_2->y.HALF.HI - (super->y.HALF.HI + temp);
param_2->x.HALF.HI = super->x.HALF_U.HI;
param_2->y.HALF.HI = super->y.HALF.HI + temp;
param_2->hitbox->offset_x = param_2->spriteOffsetX;
param_2->hitbox->offset_y = param_2->spriteOffsetY;
}