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

More clean up

Browse source
This commit is contained in:
Aaghat 2023-09-09 10:16:14 +05:30
parent dbeaa2b2e9
commit 6ac16c8c2e
6 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/graphics.h
View file

@ -7712,7 +7712,6 @@ extern const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[];
extern const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[]; extern const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[];
#endif #endif
// berry tag screen // berry tag screen
extern const u32 gBerryCheck_Gfx[]; extern const u32 gBerryCheck_Gfx[];
extern const u32 gBerryCheck_Pal[]; extern const u32 gBerryCheck_Pal[];

2
include/pokedex.h
View file

@ -36,7 +36,7 @@ void ResetPokedex(void);
u16 GetPokedexHeightWeight(u16 dexNum, u8 data); u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
u16 GetNationalPokedexCount(u8); u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8); u16 GetHoennPokedexCount(u8);
u8 DisplayCaughtMonDexPage(u16 species, u32 otId, u32 personality); u8 DisplayCaughtMonDexPage(u16 dexNum, u32 otId, u32 personality);
s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
bool16 HasAllHoennMons(void); bool16 HasAllHoennMons(void);

6
include/pokedex_plus_hgss.h
View file

@ -1,11 +1,9 @@
#ifndef GUARD_POKEDEX_PLUS_HGSS_H #ifndef GUARD_POKEDEX_PLUS_HGSS_H
#define GUARD_POKEDEX_PLUS_HGSS_H #define GUARD_POKEDEX_PLUS_HGSS_H
extern u8 gUnusedPokedexU8; #if POKEDEX_PLUS_HGSS == TRUE
extern void (*gPokedexVBlankCB)(void);
void CB2_OpenPokedexPlusHGSS(void); void CB2_OpenPokedexPlusHGSS(void);
u16 NationalPokedexNumToSpeciesHGSS(u16 nationalNum); u16 NationalPokedexNumToSpeciesHGSS(u16 nationalNum);
#endif
#endif // GUARD_POKEDEX_PLUS_HGSS_H #endif // GUARD_POKEDEX_PLUS_HGSS_H

1
include/strings.h
View file

@ -658,7 +658,6 @@ extern const u8 gText_FORMS_Buttons_Submenu_Decapped_PE[];
extern const u8 gText_FORMS_NONE[]; extern const u8 gText_FORMS_NONE[];
#endif #endif
// birch dex rating text // birch dex rating text
extern const u8 gBirchDexRatingText_LessThan10[]; extern const u8 gBirchDexRatingText_LessThan10[];
extern const u8 gBirchDexRatingText_LessThan20[]; extern const u8 gBirchDexRatingText_LessThan20[];

2
src/daycare.c
View file

@ -806,7 +806,6 @@ u8 GetEggMovesSpecies(u16 species, u16 *eggMoves)
return numEggMoves; return numEggMoves;
} }
#endif
bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HGSS_Ui bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HGSS_Ui
{ {
@ -832,6 +831,7 @@ bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HG
} }
return FALSE; return FALSE;
} }
#endif
static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother) static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
{ {

2
src/pokedex.c
View file

@ -14,7 +14,9 @@
#include "overworld.h" #include "overworld.h"
#include "palette.h" #include "palette.h"
#include "pokedex.h" #include "pokedex.h"
#if POKEDEX_PLUS_HGSS == TRUE
#include "pokedex_plus_hgss.h" #include "pokedex_plus_hgss.h"
#endif
#include "pokedex_area_screen.h" #include "pokedex_area_screen.h"
#include "pokedex_cry_screen.h" #include "pokedex_cry_screen.h"
#include "scanline_effect.h" #include "scanline_effect.h"