mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-17 03:57:38 +01:00
Merge pull request #1559 from ExpoSeed/PE/fix-redefinition-error
Include expansion_branches.h in global.h
This commit is contained in:
commit
efdc513912
@ -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("");
|
||||||
|
Loading…
Reference in New Issue
Block a user