diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/credits.h | 6 | ||||
-rw-r--r-- | include/graphics.h | 3 | ||||
-rw-r--r-- | include/hall_of_fame.h | 2 | ||||
-rw-r--r-- | include/pokemon.h | 2 | ||||
-rw-r--r-- | include/save.h | 11 | ||||
-rw-r--r-- | include/strings.h | 14 | ||||
-rw-r--r-- | include/trainer_pokemon_sprites.h | 1 |
7 files changed, 26 insertions, 13 deletions
diff --git a/include/credits.h b/include/credits.h new file mode 100644 index 000000000..763abd77f --- /dev/null +++ b/include/credits.h @@ -0,0 +1,6 @@ +#ifndef GUARD_CREDITS_H +#define GUARD_CREDITS_H + +extern bool8 gHasHallOfFameRecords; + +#endif //GUARD_CREDITS_H diff --git a/include/graphics.h b/include/graphics.h index 0e804e17c..bc87e4d53 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4226,4 +4226,7 @@ extern const u16 gTradeMenuMonBox_Tilemap[]; extern const u16 gUnknown_8E9CBBC[]; extern const u16 gUnknown_8E9CB9C[]; +extern const u32 gFile_graphics_misc_confetti_sheet[]; +extern const u32 gFile_graphics_misc_confetti_palette[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index 1d2122399..fd8aed909 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -7,7 +7,7 @@ void CB2_DoHallOfFameScreen(void); void CB2_DoHallOfFameScreenDontSaveData(void); void CB2_DoHallOfFamePC(void); void sub_8175280(void); -void sub_80F2978(void); +void CB2_InitHofPC(void); void HallOfFamePCBeginFade(void); void ReturnFromHallOfFamePC(void); diff --git a/include/pokemon.h b/include/pokemon.h index 79933a22c..3d0faca36 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -609,7 +609,7 @@ u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm); u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves); u8 GetNumberOfRelearnableMoves(struct Pokemon *mon); -u16 sub_8043F90(u16 species); +u16 SpeciesToPokedexNum(u16 species); void ClearBattleMonForms(void); void PlayBattleBGM(void); void PlayMapChosenOrBattleBGM(u16 songId); diff --git a/include/save.h b/include/save.h index 41d2ec666..5b7223e77 100644 --- a/include/save.h +++ b/include/save.h @@ -62,17 +62,6 @@ enum CHECK // unused }; -// Do save types -enum -{ - NORMAL_SAVE, - LINK_SAVE, - EREADER_SAVE, - HOF_SAVE, - DIFFERENT_FILE_SAVE, - HOF_DELETE_SAVE // unused -}; - extern u16 gFirstSaveSector; extern u32 gPrevSaveCounter; extern u16 gLastKnownGoodSector; diff --git a/include/strings.h b/include/strings.h index 32f4dcf43..80ede79ef 100644 --- a/include/strings.h +++ b/include/strings.h @@ -710,4 +710,18 @@ extern const u8 gEasyChatGroupName_TrendySaying[]; extern const u8 gEasyChatGroupName_Pokemon2[]; extern const u8 gText_ThreeQuestionMarks[]; +// hall_of_fame +extern const u8 gText_LeagueChamp[]; +extern const u8 gText_HOFNumber[]; +extern const u8 gText_UPDOWNPick_ABUTTONBBUTTONCancel[]; +extern const u8 gText_UPDOWNPick_ABUTTONNext_BBUTTONBack[]; +extern const u8 gText_ABUTTONExit[]; +extern const u8 gText_HOFCorrupted[]; +extern const u8 gText_WelcomeToHOF[]; +extern const u8 gText_Number[]; +extern const u8 gText_Level[]; +extern const u8 gText_IDNumber[]; +extern const u8 gText_Name[]; +extern const u8 gText_MainMenuTime[]; + #endif //GUARD_STRINGS_H diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index a267737f5..3e27f58e4 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -12,6 +12,7 @@ u16 sub_818D8F0(u16 spriteId); u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); u8 sub_818D97C(u8 a0, u8 a1); u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); +u16 FreeAndDestroyMonPicSprite(u16); u16 FreeAndDestroyTrainerPicSprite(u16); u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass); u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); |