diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-12-29 00:57:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 00:57:37 -0500 |
| commit | 4192a40adf85e4825775f16a33df6e84d6ec0bcb (patch) | |
| tree | 276dec6b4672931232c9ec6e1134b463cc773abd /include/global.h | |
| parent | f554f09aedeea7478e650d263a40a9949bc898d6 (diff) | |
| parent | aadab8b0167f1f74a28d4234509faffd8dca7bc2 (diff) | |
Merge pull request #1583 from GriffinRichards/renametilemaps
Give less generic names to some tilemaps, some misc fixes
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 024280f98..ca5f50916 100644 --- a/include/global.h +++ b/include/global.h @@ -11,6 +11,8 @@ #include "constants/species.h" #include "constants/berry.h" #include "constants/maps.h" +#include "constants/pokemon.h" +#include "constants/easy_chat.h" // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); @@ -127,6 +129,7 @@ #define DEX_FLAGS_NO ROUND_BITS_TO_BYTES(NUM_SPECIES) #define NUM_FLAG_BYTES ROUND_BITS_TO_BYTES(FLAGS_COUNT) +#define NUM_ADDITIONAL_PHRASE_BYTES ROUND_BITS_TO_BYTES(NUM_ADDITIONAL_PHRASES) struct Coords8 { @@ -984,7 +987,7 @@ struct SaveBlock1 /*0x2BC8*/ u16 easyChatBattleWon[EASY_CHAT_BATTLE_WORDS_COUNT]; /*0x2BD4*/ u16 easyChatBattleLost[EASY_CHAT_BATTLE_WORDS_COUNT]; /*0x2BE0*/ struct Mail mail[MAIL_COUNT]; - /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system + /*0x2E20*/ u8 additionalPhrases[NUM_ADDITIONAL_PHRASE_BYTES]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct DewfordTrend dewfordTrends[SAVED_TRENDS_COUNT]; /*0x2e90*/ struct ContestWinner contestWinners[NUM_CONTEST_WINNERS]; // see CONTEST_WINNER_* |