diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-15 03:36:53 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-15 03:36:53 -0400 |
| commit | 33bda740ea4342546d349235f90d2402c2a80088 (patch) | |
| tree | 8552fae690a99b13421f0ecdc6824aa3e69d4438 /include/asm.inc.h | |
| parent | 8435b8835a9b5c5348b2849e943e36ffdd8c76b3 (diff) | |
| parent | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (diff) | |
field_effect.c merge
Diffstat (limited to 'include/asm.inc.h')
| -rw-r--r-- | include/asm.inc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index dcc6190cc..1a5e9447f 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -42,7 +42,7 @@ void LoadWordFromTwoHalfwords(u16 *, u32 *); u8 Daycare_CountPokemon(struct BoxPokemon *); // asm/daycare.o -void sub_8041324(struct BoxPokemon *, void *); +void sub_8041324(struct BoxPokemon *, struct RecordMixing_UnknownStruct *); void sub_8041790(int i); u16 sub_8041870(u16); void sub_8041940(void); @@ -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); |