diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-21 14:38:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 14:38:23 -0400 |
| commit | e5a08d9632bb74bb6e0b15c08428554fa98bb644 (patch) | |
| tree | 99cf0ef144ece8f3d8bda58e2e2cd69f20c635a9 /include | |
| parent | bfe02a627f9f49a94f90835d4284ab89d4e5a6f9 (diff) | |
| parent | e093a13a4b0e72f9f150d98bf0df8dab981316c2 (diff) | |
Merge pull request #295 from marijnvdwerf/decompile/credits-3
Decompile/credits 3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 3 | ||||
| -rw-r--r-- | include/pokemon.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index c28050929..d85eeb668 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -422,6 +422,9 @@ void sub_8134AC0(void *); // src/player_pc.o void NewGameInitPCItems(void); +// asm/hall_of_fame.o +void sub_8143648(u16 paletteTag, u8 arg1); + // src/diploma.o void sub_8145D88(void); diff --git a/include/pokemon.h b/include/pokemon.h index ae02de8ca..15a028d6e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -462,4 +462,5 @@ void MonRestorePP(struct Pokemon *); u8 *sub_803F378(u16 itemId); +u16 NationalPokedexNumToSpecies(u16 nationalNum); #endif // GUARD_POKEMON_H |