diff options
| author | drifloony <drifloony@users.noreply.github.com> | 2017-07-21 15:34:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 15:34:05 -0700 |
| commit | 8ed167339c52b32e5149077e9e2c91f981268af9 (patch) | |
| tree | 765873e0da27644ad94fcf0eee9a8f76f95e96c6 /src/rom3.c | |
| parent | 95d3a7848ca07ad7035d1a717b489c4ea303a3ba (diff) | |
| parent | 68e47a6fa0b56451223c22dc9a759534c988db5b (diff) | |
Merge branch 'master' into mon_markings
Diffstat (limited to 'src/rom3.c')
| -rw-r--r-- | src/rom3.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rom3.c b/src/rom3.c index 9d8d39f91..02def5dfa 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -24,9 +24,10 @@ extern u16 gBattleTypeFlags; extern u16 gBattleWeather; extern struct BattlePokemon gBattleMons[]; -extern u8 gUnknown_020238C4; -extern u8 gUnknown_020238C5; -extern u8 gUnknown_020238C6; +static EWRAM_DATA u8 gUnknown_020238C4 = 0; +static EWRAM_DATA u8 gUnknown_020238C5 = 0; +static EWRAM_DATA u8 gUnknown_020238C6 = 0; + extern u32 gUnknown_020239FC; extern u8 gBattleBufferA[][0x200]; extern u8 gBattleBufferB[][0x200]; @@ -49,13 +50,14 @@ extern u8 gUnknown_02024C78; extern u8 gBattleOutcome; extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; -extern u8 gBattleBuffersTransferData[]; extern u8 gBattleTextBuff1[]; extern u8 gBattleTextBuff2[]; extern u8 gBattleTextBuff3[]; extern void (*gBattleMainFunc)(void); extern void (*gBattleBankFunc[])(void); +u8 gBattleBuffersTransferData[0x170]; + void sub_800B858(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) |