fix merge conflicts

1 files changed, 6 insertions, 6 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index dbd3f0820..1a5e9447f 100755..100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -24,7 +24,7 @@ void sub_802E3E4(u8, int);
 void nullsub_8(u8);
 
 // asm/battle_7.o
-void sub_8032AA8(u8 index, int i);
+void sub_8032AA8(u8, u8);
 
 // src/pokemon_3.o
 u16 SpeciesToNationalPokedexNum(u16);
@@ -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);
@@ -286,7 +286,7 @@ void sub_80BD674(void *, u32, u8);
 
 // asm/tv.o
 void ClearTVShowData(void);
-void UpdateTVScreensOnMap(u32, u32);
+void UpdateTVScreensOnMap(int, int);
 void ResetGabbyAndTy(void);
 u8 sub_80BDEAC(u8 *);
 void sub_80BE160(TVShow *);