atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #659 from ultima-soul/pokemon

Browse source 
Remove pokemon_3.h
This commit is contained in:
Diegoisawesome 2019-04-04 12:49:46 -05:00 committed by GitHub
commit f125de3e66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/pokemon_3.h
View file

@ -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

2
src/main_menu.c
View file

@ -23,7 +23,7 @@
#include "palette.h" #include "palette.h"
#include "pokeball.h" #include "pokeball.h"
#include "pokedex.h" #include "pokedex.h"
#include "pokemon_3.h" #include "pokemon.h"
#include "random.h" #include "random.h"
#include "rtc.h" #include "rtc.h"
#include "save.h" #include "save.h"