atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IDE support formatting and consistency

Browse source
This commit is contained in:
Jademalo 2021-10-23 10:10:00 +01:00
parent eb860a368e
commit 62436d9f67
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
berry_fix/payload/include/global.h
View file

@ -6,16 +6,17 @@
// global.h from pokemon ruby // global.h from pokemon ruby
// IDE support // IDE support
#if defined (__APPLE__) || defined (__CYGWIN__) || defined (__INTELLISENSE__) #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
#define _(x) x // We define these when using certain IDEs to fool preproc
#define __(x) x #define _(x) (x)
#define INCBIN(x) {0} #define __(x) (x)
#define INCBIN_U8 INCBIN #define INCBIN(...) {0}
#define INCBIN_U16 INCBIN #define INCBIN_U8 INCBIN
#define INCBIN_U32 INCBIN #define INCBIN_U16 INCBIN
#define INCBIN_S8 INCBIN #define INCBIN_U32 INCBIN
#define INCBIN_S16 INCBIN #define INCBIN_S8 INCBIN
#define INCBIN_S32 INCBIN #define INCBIN_S16 INCBIN
#define INCBIN_S32 INCBIN
#endif // IDE support #endif // IDE support
// Prevent cross-jump optimization. // Prevent cross-jump optimization.

23
include/global.h
View file

@ -19,17 +19,18 @@
#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
#define NAKED __attribute__((naked)) #define NAKED __attribute__((naked))
// IDE support /// IDE support
#if defined (__APPLE__) || defined (__CYGWIN__) || defined (__INTELLISENSE__) #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
#define _(x) x // We define these when using certain IDEs to fool preproc
#define __(x) x #define _(x) (x)
#define INCBIN(x) {0} #define __(x) (x)
#define INCBIN_U8 INCBIN #define INCBIN(...) {0}
#define INCBIN_U16 INCBIN #define INCBIN_U8 INCBIN
#define INCBIN_U32 INCBIN #define INCBIN_U16 INCBIN
#define INCBIN_S8 INCBIN #define INCBIN_U32 INCBIN
#define INCBIN_S16 INCBIN #define INCBIN_S8 INCBIN
#define INCBIN_S32 INCBIN #define INCBIN_S16 INCBIN
#define INCBIN_S32 INCBIN
#endif // IDE support #endif // IDE support
#define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0]))