diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:12 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:12 -0400 |
| commit | bf5ee99db06cbd805058cc4c2f0fcb4ccf9506da (patch) | |
| tree | 5d55b2504c4ebc3d0108b4eb9c495e189fc485cb /include/asm.inc.h | |
| parent | 175d4724a33bbb34e1a5ee609584a45ab9685058 (diff) | |
| parent | db6818ca9149304463e5e2219ec90993a3af53b2 (diff) | |
Merge branch 'field_effect'
Diffstat (limited to 'include/asm.inc.h')
| -rwxr-xr-x[-rw-r--r--] | include/asm.inc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 7c090dec2..3837af64b 100644..100755 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -207,9 +207,9 @@ void sub_8083A84(TaskFunc); s32 sub_8083BF4(u8 id); // asm/field_effect.o -u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); -void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); -u8 CreateBirchSprite(u8, u8, u8); +u8 CreateTrainerSprite_BirchSpeech(u8, s16, s16, u8, u8 *); +void LoadTrainerGfx_TrainerCard(u8 gender, u16, u8 *); +u8 CreateBirchSprite(s16, s16, u8); // asm/unknown_task.o void remove_some_task(void); |