From 5a73f4f645faf368cf8e20cfe4793e2b12672472 Mon Sep 17 00:00:00 2001 From: Gogume1er Date: Tue, 1 Jun 2021 19:03:45 +0200 Subject: inline functions & format file --- arm9/src/unk_020851B8.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/arm9/src/unk_020851B8.c b/arm9/src/unk_020851B8.c index 2615d3fd..8608cc57 100644 --- a/arm9/src/unk_020851B8.c +++ b/arm9/src/unk_020851B8.c @@ -1,9 +1,10 @@ #include "global.h" -#include "heap.h" -#include "constants/items.h" #include "unk_020851B8.h" +#include "constants/items.h" +#include "heap.h" -static inline void _clear(u8 *ptr) { +static inline void _clear(u8 *ptr) +{ *ptr++ = 0; *ptr++ = 0; *ptr++ = 0; @@ -21,7 +22,7 @@ static inline void _clear(u8 *ptr) { THUMB_FUNC struct UnkStruct_020851B8 *FUN_020851B8(u32 heap_id) { struct UnkStruct_020851B8 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_020851B8)); - _clear((u8 *) ptr); + _clear((u8 *)ptr); return ptr; } @@ -45,17 +46,12 @@ THUMB_FUNC void FUN_020851F8(struct UnkStruct_020851B8 *param0, u8 param1, u8 pa THUMB_FUNC void FUN_02085200(struct UnkStruct_020851B8 *param0, u16 berry_id) { - u32 index = berry_id / 32; - u32 tag = 1 << (berry_id % 32); - param0->flags[index] |= tag; + param0->flags[berry_id / 32] |= 1 << (berry_id % 32); } THUMB_FUNC u8 FUN_02085224(struct UnkStruct_020851B8 *param0, u16 berry_id) { - u32 index = berry_id / 32; - u32 tag = 1 << (berry_id % 32); - - return param0->flags[index] & tag ? 1 : 0; + return param0->flags[berry_id / 32] & (1 << (berry_id % 32)) ? 1 : 0; } THUMB_FUNC void FUN_0208524C(struct UnkStruct_020851B8 *param0, u8 *param1, u8 *param2) -- cgit v1.2.3