diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry.h | 12 | ||||
| -rw-r--r-- | include/decompress.h | 4 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 31 | ||||
| -rw-r--r-- | include/global.h | 9 | ||||
| -rw-r--r-- | include/mail.h | 2 | ||||
| -rw-r--r-- | include/rom4.h | 2 | ||||
| -rw-r--r-- | include/species.h | 1 |
7 files changed, 50 insertions, 11 deletions
diff --git a/include/berry.h b/include/berry.h index 2b2933412..152f92e38 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,16 +1,16 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H -void unref_sub_80B4884(void); -void sub_80B48A8(u8 *src); -u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry); -bool32 sub_80B4940(void); +void ClearEnigmaBerries(void); +void SetEnigmaBerry(u8 *src); +u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); +bool32 IsEnigmaBerryValid(void); struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); bool32 FieldObjectInteractionWaterBerryTree(void); bool32 IsPlayerFacingPlantedBerryTree(void); -u8 WaterBerryTree(void); -void sub_80B4A90(void); +u8 TryToWaterBerryTree(void); +void ClearBerryTrees(void); bool32 BerryTreeGrow(struct BerryTree *tree); void BerryTreeTimeUpdate(int time); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); diff --git a/include/decompress.h b/include/decompress.h index a9bdd341b..28570afdd 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -10,8 +10,8 @@ void LoadCompressedObjectPicOverrideBuffer(const struct SpriteSheet *a, void *bu void LoadCompressedObjectPalette(const struct SpritePalette *a); void LoadCompressedObjectPaletteOverrideBuffer(const struct SpritePalette *a, void *buffer); void DecompressPicFromTable_2(const struct SpriteSheet *a, u8 b, u8 c, void *d, void *e, s32 f); -void sub_800D334(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s32 f, u32 g); -void sub_800D378(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s32 f, u32 g, u32 h); +void HandleLoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g); +void LoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g, u32 h); void Unused_LZDecompressWramIndirect(const void **src, void *dest); #endif // GUARD_DECOMPRESS_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index caef5855f..95ccf2614 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -11,6 +11,35 @@ enum CONNECTION_EMERGE }; +// map types +enum +{ + MAP_TYPE_0, + MAP_TYPE_TOWN, + MAP_TYPE_CITY, + MAP_TYPE_ROUTE, + MAP_TYPE_UNDERGROUND, + MAP_TYPE_UNDERWATER, + MAP_TYPE_6, + MAP_TYPE_7, + MAP_TYPE_INDOOR, + MAP_TYPE_SECRET_BASE +}; + +// map battle scenes +enum +{ + MAP_BATTLE_SCENE_NORMAL, // 0 + MAP_BATTLE_SCENE_GYM, // 1 + MAP_BATTLE_SCENE_MAGMA, // 2 + MAP_BATTLE_SCENE_AQUA, // 3 + MAP_BATTLE_SCENE_SIDNEY, // 4 + MAP_BATTLE_SCENE_PHOEBE, // 5 + MAP_BATTLE_SCENE_GLACIA, // 6 + MAP_BATTLE_SCENE_DRAKE, // 7 + MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 +}; + typedef void (*TilesetCB)(void); struct Tileset @@ -113,7 +142,7 @@ struct MapHeader u8 name; u8 cave; u8 weather; - /* 0x17 */ u8 light; + /* 0x17 */ u8 mapType; u8 filler_18; u8 escapeRope; u8 flags; diff --git a/include/global.h b/include/global.h index 4d736cdef..004d9c50d 100644 --- a/include/global.h +++ b/include/global.h @@ -66,6 +66,15 @@ enum OPTIONS_BATTLE_STYLE_SET }; +enum +{ + BAG_ITEMS = 1, + BAG_POKEBALLS, + BAG_TMsHMs, + BAG_BERRIES, + BAG_KEYITEMS +}; + struct Coords16 { s16 x; diff --git a/include/mail.h b/include/mail.h index 67a190b9c..693b0b2dc 100644 --- a/include/mail.h +++ b/include/mail.h @@ -3,6 +3,6 @@ #include "main.h" -void sub_80F890C(struct MailStruct *arg0, MainCallback arg1, bool8 arg2); +void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2); #endif // GUARD_MAIL_H diff --git a/include/rom4.h b/include/rom4.h index 036f43c36..a182a0bff 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -72,7 +72,7 @@ void player_avatar_init_params_reset(void); u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3); u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8, u16, u8); u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void); -bool32 sub_8053C44(void); +bool32 IsBikingAllowedByMap(void); void sub_8053C98(void); void sub_8053CE4(s32 a1); u8 sav1_get_flash_used_on_map(void); diff --git a/include/species.h b/include/species.h index 5802f782d..7abc6349b 100644 --- a/include/species.h +++ b/include/species.h @@ -388,5 +388,6 @@ #define SPECIES_JIRACHI 0x199 #define SPECIES_DEOXYS 0x19a #define SPECIES_CHIMECHO 0x19b +#define SPECIES_EGG 0x19c #endif // GUARD_SPECIES_H |