Merge pull request #1559 from ExpoSeed/PE/fix-redefinition-error

Include expansion_branches.h in global.h
This commit is contained in:
ultima-soul 2021-07-04 13:42:14 -07:00 committed by GitHub
commit efdc513912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,6 +10,7 @@
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/berry.h" #include "constants/berry.h"
#include "constants/expansion_branches.h"
// Prevent cross-jump optimization. // Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm(""); #define BLOCK_CROSS_JUMP asm("");