dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use actual filename/lineno in AGBAssert calls for modern

Browse Source
This commit is contained in:
PikalaxALT
2020-04-06 15:13:47 -04:00
parent bbeef52a01
commit b2e8e02364
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -222,6 +222,7 @@ $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
else else
$(C_BUILDDIR)/berry_crush_2.o: CFLAGS += -Wno-address-of-packed-member $(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)/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)/text.o: CFLAGS += -Wno-address-of-packed-member
$(C_BUILDDIR)/battle_tower.o: CFLAGS += -Wno-div-by-zero $(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 $(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
+5
View File
@@ -35,6 +35,10 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
// for matching purposes // 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 #ifdef NDEBUG
#define AGB_ASSERT_EX(exp, file, line) #define AGB_ASSERT_EX(exp, file, line)
#else #else
@@ -46,5 +50,6 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
#else #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
#endif
#endif // GUARD_GBA_ISAGBPRINT_H #endif // GUARD_GBA_ISAGBPRINT_H
src/battle_interface.c
+1
View File
@@ -16,6 +16,7 @@
destWidth - w; \ destWidth - w; \
}) })
#undef abs
#define abs(a) ((a) < 0 ? -(a) : (a)) #define abs(a) ((a) < 0 ? -(a) : (a))
#define Q_24_8(n) ((s32)((n) * 256)) #define Q_24_8(n) ((s32)((n) * 256))