dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into data_dump

Browse Source
This commit is contained in:
ultima-soul
2019-10-15 07:48:46 -07:00
parent 684961656f 407fc23f3f
commit 94f722e719
16 changed files with 831 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/graphics.h
+38 -1
View File
@@ -2561,7 +2561,6 @@ extern const u8 gUnknown_08DDB2C4[];
extern const u16 gUnknown_08DDAFE0[];
// fame_checker
extern const u16 gFameCheckerBgPals[0x30];
extern const u16 gFameCheckerBgTiles[0xa50];
extern const u16 gFameCheckerBg3Tilemap[0x400];
@@ -3457,4 +3456,42 @@ extern const u8 gTrainerBackPic_OldMan[];
extern const u8 gTrainerBackPic_RubySapphireBrendan[];
extern const u8 gTrainerBackPic_RubySapphireMay[];
// mail
extern const u16 gFile_graphics_mail_orange_palette_pal[];
extern const u16 gFile_graphics_mail_harbor_palette_pal[];
extern const u16 gFile_graphics_mail_glitter_palette_pal[];
extern const u16 gFile_graphics_mail_mech_palette_pal[];
extern const u16 gFile_graphics_mail_wood_palette_pal[];
extern const u16 gFile_graphics_mail_wave_palette_pal[];
extern const u16 gFile_graphics_mail_bead_palette_pal[];
extern const u16 gFile_graphics_mail_shadow_palette_pal[];
extern const u16 gFile_graphics_mail_tropic_palette_pal[];
extern const u16 gFile_graphics_mail_dream_palette_pal[];
extern const u16 gFile_graphics_mail_fab_palette_pal[];
extern const u16 gFile_graphics_mail_retro_palette_pal[];
extern const u32 gFile_graphics_mail_orange_tiles_sheet[];
extern const u32 gFile_graphics_mail_harbor_tiles_sheet[];
extern const u32 gFile_graphics_mail_glitter_tiles_sheet[];
extern const u32 gFile_graphics_mail_mech_tiles_sheet[];
extern const u32 gFile_graphics_mail_wood_tiles_sheet[];
extern const u32 gFile_graphics_mail_wave_tiles_sheet[];
extern const u32 gFile_graphics_mail_bead_tiles_sheet[];
extern const u32 gFile_graphics_mail_shadow_tiles_sheet[];
extern const u32 gFile_graphics_mail_tropic_tiles_sheet[];
extern const u32 gFile_graphics_mail_dream_tiles_sheet[];
extern const u32 gFile_graphics_mail_fab_tiles_sheet[];
extern const u32 gFile_graphics_mail_retro_tiles_sheet[];
extern const u32 gFile_graphics_mail_orange_map_tilemap[];
extern const u32 gFile_graphics_mail_harbor_map_tilemap[];
extern const u32 gFile_graphics_mail_glitter_map_tilemap[];
extern const u32 gFile_graphics_mail_mech_map_tilemap[];
extern const u32 gFile_graphics_mail_wood_map_tilemap[];
extern const u32 gFile_graphics_mail_wave_map_tilemap[];
extern const u32 gFile_graphics_mail_bead_map_tilemap[];
extern const u32 gFile_graphics_mail_shadow_map_tilemap[];
extern const u32 gFile_graphics_mail_tropic_map_tilemap[];
extern const u32 gFile_graphics_mail_dream_map_tilemap[];
extern const u32 gFile_graphics_mail_fab_map_tilemap[];
extern const u32 gFile_graphics_mail_retro_map_tilemap[];
#endif //GUARD_GRAPHICS_H
include/mail.h
+4 -1
View File
@@ -18,7 +18,10 @@
|| itemId == ITEM_FAB_MAIL \
|| itemId == ITEM_RETRO_MAIL))
#define FIRST_MAIL_IDX ITEM_ORANGE_MAIL
void sub_80BEBEC(struct MailStruct * mail, void (* callback)(void), u8 a2);
#define ITEM_TO_MAIL(itemId) (itemId - FIRST_MAIL_IDX)
void ReadMail(struct MailStruct * mail, void (*savedCallback)(void), bool8 messageExists);
#endif // GUARD_MAIL_H
include/player_pc.h
+1
View File
@@ -19,6 +19,7 @@ struct PlayerPCItemPageStruct
};
// Exported RAM declarations
extern struct PlayerPCItemPageStruct gPlayerPcMenuManager;
// Exported ROM declarations
include/pokemon_icon.h
+2
View File
@@ -17,5 +17,7 @@ u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32);
void sub_8097070(struct Sprite *);
u16 GetUnownLetterByPersonality(u32 personality);
u8 UpdateMonIconFrame(struct Sprite *sprite);
void sub_80970E0(u16 iconId);
void sub_8097168(u16 iconId);
#endif // GUARD_POKEMON_ICON_H
include/strings.h
+3
View File
@@ -472,4 +472,7 @@ extern const u8 gSaveStatName_Badges[];
extern const u8 gSaveStatName_Pokedex[];
extern const u8 gSaveStatName_Time[];
// mail
extern const u8 gText_From[];
#endif //GUARD_STRINGS_H