Use actual filename/lineno in AGBAssert calls for modern

Makefile

@@ -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

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

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))