diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 19:39:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 19:39:43 -0400 |
| commit | 550333dd91f134795d9d2bd4702ea92812e277f5 (patch) | |
| tree | 05545e66bddf59fe4716e1f9f889c67cd9a25a31 /include/battle.h | |
| parent | eb778cac300608fbbed35f19123a6fb763cd85ce (diff) | |
| parent | a62fbd6ec1d34ccba25e117e0db60fd4100bfd8d (diff) | |
Merge pull request #349 from PikalaxALT/pokeblock
Pokeblock
Diffstat (limited to 'include/battle.h')
| -rwxr-xr-x[-rw-r--r--] | include/battle.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index 4e102c145..d4cb53689 100644..100755 --- a/include/battle.h +++ b/include/battle.h @@ -555,6 +555,8 @@ extern u8 ewram[]; #define ewram17810 ((struct Struct2017810 *) (ewram + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (ewram + 0x17840)) +extern u8 gBattleTextBuff1[]; + // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); @@ -637,6 +639,7 @@ void c3_0802FDF4(u8); void sub_802E3E4(u8, int); void nullsub_8(u8); void sub_802E414(void); +void sub_802E424(void); // asm/battle_7.o void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d); |