diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-02 14:56:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 14:56:56 -0800 |
| commit | 14d9b188cd8f16b4403280ae24fc7b8c059d0fc1 (patch) | |
| tree | df08926aef4bfc16f0b3f1ed16b1bc656d908e70 /include/asm.inc.h | |
| parent | 506587c676fb18a289d19561ca0de67004c7656e (diff) | |
| parent | 4d2d30beb113f5f987c73cdf1b818e0079222093 (diff) | |
Merge pull request #116 from marijnvdwerf/clean/warnings-0
Fix various warnings
Diffstat (limited to 'include/asm.inc.h')
| -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 fc7093437..567c8708e 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -19,11 +19,11 @@ void sub_80408BC(); void current_map_music_set__default_for_battle(u16); // asm/rom_8040EB4.o -void StoreWordInTwoHalfwords(u32, u8 *); -void LoadWordFromTwoHalfwords(u32, u8 *); +void StoreWordInTwoHalfwords(u16 *, u32); +void LoadWordFromTwoHalfwords(u16 *, u32); // asm/daycare.o -u8 daycare_count_pokemon(u32); +u8 daycare_count_pokemon(u8 *); void sub_8041324(struct BoxPokemon *, void *); void sub_8041790(int i); u16 sub_8041870(u16); |