diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-06 15:13:47 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-06 15:13:47 -0400 |
| commit | b2e8e023646ad3a21bc3b5fd10fb392a980c4efe (patch) | |
| tree | 4ea38c3592b99b49bed4ddeeb868528c7686f293 | |
| parent | bbeef52a014c1242dd790b14c52d933b75666f7e (diff) | |
Use actual filename/lineno in AGBAssert calls for modern
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | include/gba/isagbprint.h | 5 | ||||
| -rw-r--r-- | src/battle_interface.c | 1 |
3 files changed, 7 insertions, 0 deletions
@@ -222,6 +222,7 @@ $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet else $(C_BUILDDIR)/berry_crush_2.o: CFLAGS += -Wno-address-of-packed-member $(C_BUILDDIR)/berry_crush_3.o: CFLAGS += -Wno-address-of-packed-member +$(C_BUILDDIR)/braille_text.o: CFLAGS += -Wno-address-of-packed-member $(C_BUILDDIR)/text.o: CFLAGS += -Wno-address-of-packed-member $(C_BUILDDIR)/battle_tower.o: CFLAGS += -Wno-div-by-zero $(C_BUILDDIR)/librfu_intr.o: override CFLAGS += -marm -mthumb-interwork -O2 -mtune=arm7tdmi -march=armv4t -mabi=apcs-gnu -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h index c5eb456c3..8a64b8223 100644 --- a/include/gba/isagbprint.h +++ b/include/gba/isagbprint.h @@ -35,6 +35,10 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP // for matching purposes +#if MODERN +#define AGB_ASSERT_EX(exp, file, line) AGB_ASSERT(exp) +#define AGB_WARNING_EX(exp, file, line) AGB_WARNING(exp) +#else #ifdef NDEBUG #define AGB_ASSERT_EX(exp, file, line) #else @@ -46,5 +50,6 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP #else #define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); #endif +#endif #endif // GUARD_GBA_ISAGBPRINT_H diff --git a/src/battle_interface.c b/src/battle_interface.c index 107999045..7a8f4eb67 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -16,6 +16,7 @@ destWidth - w; \ }) +#undef abs #define abs(a) ((a) < 0 ? -(a) : (a)) #define Q_24_8(n) ((s32)((n) * 256)) |