From f24584cd3121c1773da2312f0720dc466799698c Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Fri, 7 Dec 2018 21:01:59 +0800 Subject: Tabs -> spaces & align in include/ --- include/gba/isagbprint.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include/gba') diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h index c5eb456c3..1be3852e3 100644 --- a/include/gba/isagbprint.h +++ b/include/gba/isagbprint.h @@ -5,7 +5,7 @@ #define AGBPrintInit() #define AGBPutc(cChr) #define AGBPrint(pBuf) -#define AGBPrintf(pBuf, ...) +#define AGBPrintf(pBuf, ...) #define AGBPrintFlush1Block() #define AGBPrintFlush() #define AGBAssert(pFile, nLine, pExpression, nStopProgram) @@ -21,30 +21,30 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP #undef AGB_ASSERT #ifdef NDEBUG -#define AGB_ASSERT(exp) +#define AGB_ASSERT(exp) #else -#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); +#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); #endif #undef AGB_WARNING #ifdef NDEBUG -#define AGB_WARNING(exp) +#define AGB_WARNING(exp) #else -#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); +#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); #endif // for matching purposes #ifdef NDEBUG -#define AGB_ASSERT_EX(exp, file, line) +#define AGB_ASSERT_EX(exp, file, line) #else -#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); +#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); #endif #ifdef NDEBUG -#define AGB_WARNING_EX(exp, file, line) +#define AGB_WARNING_EX(exp, file, line) #else -#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); +#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); #endif #endif // GUARD_GBA_ISAGBPRINT_H -- cgit v1.2.3 From 170b6ef44992f4b7decb31451a3756b6bd4e2d46 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Dec 2018 23:18:25 -0600 Subject: Decompile battle_intro.c (#444) --- include/gba/types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/gba') diff --git a/include/gba/types.h b/include/gba/types.h index a7dbf3e03..fff48d437 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -32,7 +32,9 @@ struct BgCnt { u16 priority:2; u16 charBaseBlock:2; - u16 dummy:4; + u16 dummy:2; + u16 mosaic:1; + u16 palettes:1; u16 screenBaseBlock:5; u16 areaOverflowMode:1; u16 screenSize:2; -- cgit v1.2.3