diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-04-04 12:49:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 12:49:46 -0500 |
| commit | f125de3e667b6d19acf1fabe2f1e700c9ef28609 (patch) | |
| tree | 537d65ca2f7f10c3499b8a795643746baa7d3d86 | |
| parent | 8361ada4babbd77a2a5dc5065903252985a4c27a (diff) | |
| parent | 48d27c035ae194419317884f64ddf4beec001e7c (diff) | |
Merge pull request #659 from ultima-soul/pokemon
Remove pokemon_3.h
| -rw-r--r-- | include/pokemon_3.h | 10 | ||||
| -rw-r--r-- | src/main_menu.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/pokemon_3.h b/include/pokemon_3.h deleted file mode 100644 index 263839b19..000000000 --- a/include/pokemon_3.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GUARD_POKEMON_3_H -#define GUARD_POKEMON_3_H - -u16 sub_806EFF0(u16); -const u8* GetTrainerClassNameFromId(u16 trainerId); -const u8* GetTrainerNameFromId(u16 trainerId); -void PlayMapChosenOrBattleBGM(u16 song); -u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); - -#endif // GUARD_POKEMON_3_H diff --git a/src/main_menu.c b/src/main_menu.c index 8c9612c24..504c1bd33 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -23,7 +23,7 @@ #include "palette.h" #include "pokeball.h" #include "pokedex.h" -#include "pokemon_3.h" +#include "pokemon.h" #include "random.h" #include "rtc.h" #include "save.h" |