diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-21 15:12:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 15:12:16 -0400 |
| commit | 8cbbd78f0032dd243555b3e2c0ecdf06e72d46d5 (patch) | |
| tree | 96a75ac62a3a64e0432ade8f561fa1955ce46665 /include/asm.inc.h | |
| parent | e5a08d9632bb74bb6e0b15c08428554fa98bb644 (diff) | |
| parent | 619da0f339c4d529de919d0b73b747fa16127d37 (diff) | |
Merge pull request #300 from NieDzejkob/master
some daycare and record_mixing, rename PlaySE to PlaySoundEffect - wide code is good code
Diffstat (limited to 'include/asm.inc.h')
| -rw-r--r-- | include/asm.inc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index d85eeb668..72c43f4fd 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -31,7 +31,7 @@ void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); // src/daycare.o -u8 daycare_count_pokemon(u8 *); +u8 Daycare_CountPokemon(struct BoxPokemon *); // asm/daycare.o void sub_8041324(struct BoxPokemon *, void *); |