diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /include/battle.h | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
Diffstat (limited to 'include/battle.h')
| -rwxr-xr-x[-rw-r--r--] | include/battle.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index bd3aa4225..c57c9c238 100644..100755 --- a/include/battle.h +++ b/include/battle.h @@ -604,6 +604,8 @@ void dp01_build_cmdbuf_x37_a(u8 a, u8 b); //0x37 void MarkBufferBankForExecution(u8 bank); +extern u8 gBattleTextBuff1[]; + // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); |