diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /include | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/constants/battle.h (renamed from include/constants/battle_constants.h) | 0 | ||||
| -rw-r--r-- | include/gba/defines.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index a799f8360..78b9d13de 100644 --- a/include/battle.h +++ b/include/battle.h @@ -2,7 +2,7 @@ #define GUARD_BATTLE_H #include "sprite.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "battle_setup.h" #define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank])) @@ -762,6 +762,8 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN1V; +extern u8 gLastHitBy[MAX_BATTLERS_COUNT]; + extern u8 gDisplayedStringBattle[]; extern u16 gBattleTypeFlags; diff --git a/include/constants/battle_constants.h b/include/constants/battle.h index afa7fecf1..afa7fecf1 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle.h diff --git a/include/gba/defines.h b/include/gba/defines.h index 26e0c873f..e53ccfccf 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -17,6 +17,9 @@ #define INTR_CHECK (*(u16 *)0x3007FF8) #define INTR_VECTOR (*(void **)0x3007FFC) +#define EWRAM 0x2000000 +#define IWRAM 0x3000000 + #define PLTT 0x5000000 #define PLTT_SIZE 0x400 |