diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-07-03 16:57:44 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-07-03 16:57:44 -0400 |
| commit | 85beaf7f82b9848cf21fe40b86a51027cd5fbbc1 (patch) | |
| tree | e4c20560416857c59dcaa0a0bf1e8682b49f6707 /src/battle_main.c | |
| parent | 72fc4b6f844a47ac4711c421cc4e06e0197dc7c5 (diff) | |
| parent | bbf39b8560c752d6b7e94bf1fea9ac60dc79c902 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered into cast_test
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 021a0ca81..53757d13c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -125,7 +125,7 @@ EWRAM_DATA u8 gDisplayedStringBattle[300] = {0}; EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0}; -static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0}; +static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0}; // Note: This shouldn't be removed without adjusting the size of gDisplayedStringBattle. EWRAM_DATA u32 gBattleTypeFlags = 0; EWRAM_DATA u8 gBattleTerrain = 0; EWRAM_DATA u32 gUnknown_2022B54 = 0; |