diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 19:10:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 19:10:50 -0500 |
| commit | 566392f441a66da41fc827b6d2e8cbeaf1cf4825 (patch) | |
| tree | 6ba3e09d866676ac7c131c2f3e30c6485638bcb5 /include/rom3.h | |
| parent | 5891cedc1bf4c9c95d60e5118c2809895d6191a5 (diff) | |
| parent | 32977818e7ea7e14fd3dee331483ef6b06b3a00a (diff) | |
Merge pull request #384 from camthesaxman/battle_4
battle_4 fixes
Diffstat (limited to 'include/rom3.h')
| -rw-r--r-- | include/rom3.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/rom3.h b/include/rom3.h index 6b1dacd9c..1fa55d11a 100644 --- a/include/rom3.h +++ b/include/rom3.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROM3_H #define GUARD_ROM3_H +struct DisableStruct; + void sub_800B858(void); void setup_poochyena_battle(); void sub_800B950(void); @@ -24,15 +26,16 @@ void EmitFaintAnimation(u8 a); void dp01_build_cmdbuf_x0B_B_B_B(u8 a); void dp01_build_cmdbuf_x0C_C_C_C(u8 a); void EmitBallThrowAnim(u8 a, u8 b); -void EmitMoveAnimation(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, u8 *g); +void EmitMoveAnimation(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, struct DisableStruct *g); void EmitPrintString(u8 a, u16 b); +void EmitPrintStringPlayerOnly(u8 a, u16 stringID); void dp01_build_cmdbuf_x12_a_bb(u8 a, u8 b, u16 c); void sub_800CBA4(u8 a, u8 b, u8 c, u8 *d); void sub_800CBE0(u8 a, u8 *b); void EmitChoosePokemon(u8 a, u8 b, u8 c, u8 d, u8 *e); void dp01_build_cmdbuf_x17_17_17_17(u8 a); -void EmitHealthBarUpdate(u8 a, s16 b); -void EmitExpBarUpdate(u8 a, u8 b, s16 c); +void EmitHealthBarUpdate(u8 a, u16 b); +void EmitExpBarUpdate(u8 a, u8 b, u16 c); void EmitStatusIconUpdate(u8 a, u32 b, u32 c); void EmitStatusAnimation(u8 a, u8 b, u32 c); void EmitStatusXor(u8 a, u8 b); |