From 9449d6126933d30b2e65014ca1bb531dc7342120 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 5 Sep 2021 11:27:25 -0400 Subject: Use the actual defines in unk_020222E8 --- arm9/src/unk_020222E8.c | 17 +++++++++-------- include/unk_020222E8.h | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arm9/src/unk_020222E8.c b/arm9/src/unk_020222E8.c index 30a2a2c4..dbd43d8d 100644 --- a/arm9/src/unk_020222E8.c +++ b/arm9/src/unk_020222E8.c @@ -1,33 +1,34 @@ #include "global.h" #include "unk_020222E8.h" +#include "mmap.h" THUMB_FUNC void * FUN_020222E8() { - return 0x5 << 0x18; + return (void *)HW_BG_PLTT; } -THUMB_FUNC void * FUN_020222F0() +THUMB_FUNC u32 FUN_020222F0() { - return 0x2 << 0x8; + return HW_BG_PLTT_SIZE; } THUMB_FUNC void * FUN_020222F8() { - return 0x05000400; + return (void *)HW_DB_BG_PLTT; } -THUMB_FUNC void * FUN_02022300() +THUMB_FUNC u32 FUN_02022300() { - return 0x2 << 0x8; + return HW_DB_BG_PLTT_SIZE; } THUMB_FUNC void * FUN_02022308() { - return 0x05000200; + return (void *)HW_OBJ_PLTT; } THUMB_FUNC void * FUN_02022310() { - return 0x05000600; + return (void *)HW_DB_OBJ_PLTT; } diff --git a/include/unk_020222E8.h b/include/unk_020222E8.h index ac6e1932..d4545b04 100644 --- a/include/unk_020222E8.h +++ b/include/unk_020222E8.h @@ -2,9 +2,9 @@ #define POKEDIAMOND_UNK_020222E8_H void * FUN_020222E8(); -void * FUN_020222F0(); +u32 FUN_020222F0(); void * FUN_020222F8(); -void * FUN_02022300(); +u32 FUN_02022300(); void * FUN_02022308(); void * FUN_02022310(); -- cgit v1.2.3