diff --git a/asm/enemy/gleerok.s b/asm/enemy/gleerok.s index 62242ca2..74dd5bb8 100644 --- a/asm/enemy/gleerok.s +++ b/asm/enemy/gleerok.s @@ -7,26 +7,6 @@ .text - thumb_func_start sub_0802EB9C -sub_0802EB9C: @ 0x0802EB9C - push {r4, lr} - adds r4, r0, #0 - ldr r0, _0802EBBC @ =gUnk_080CD850 - bl GetRandomByWeight - ldr r1, _0802EBC0 @ =gUnk_080CD854 - adds r0, r0, r1 - ldrb r1, [r0] - adds r0, r4, #0 - adds r0, #0x74 - strb r1, [r0] - adds r4, #0x75 - ldrb r0, [r4] - adds r0, #1 - strb r0, [r4] - pop {r4, pc} - .align 2, 0 -_0802EBBC: .4byte gUnk_080CD850 -_0802EBC0: .4byte gUnk_080CD854 thumb_func_start sub_0802EBC4 sub_0802EBC4: @ 0x0802EBC4 diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c index d4805db2..169a599b 100644 --- a/src/enemy/gleerok.c +++ b/src/enemy/gleerok.c @@ -57,13 +57,15 @@ extern u8 gUnk_080CD884[]; extern u8 gUnk_080CD7F8[]; extern u8 gUnk_080CD840[]; extern u8 gUnk_080CD844[]; +extern u8 gUnk_080CD850[]; +extern u8 gUnk_080CD854[]; extern u32 sub_0806FC80(Entity*, Entity*, s32); extern void sub_0802E518(GleerokEntity* this); extern void sub_0802E7E4(Gleerok_HeapStruct* this); extern void sub_0802E1D0(GleerokEntity* this); -extern u32 sub_0802EB9C(GleerokEntity* this); +extern void sub_0802EB9C(GleerokEntity* this); extern void sub_0802D86C(GleerokEntity* this); extern void sub_0802E430(GleerokEntity* this); extern void sub_0802EBC4(GleerokEntity* this); @@ -1488,3 +1490,8 @@ NONMATCH("asm/non_matching/gleerok/sub_0802EB08.inc", return uVar7; } END_NONMATCH + +void sub_0802EB9C(GleerokEntity* this) { + this->unk_74 = gUnk_080CD854[GetRandomByWeight(gUnk_080CD850)]; + this->unk_75++; +}