diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 4 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/gba/types.h | 4 | ||||
| -rw-r--r-- | include/pokedex_area_markers.h | 16 | ||||
| -rw-r--r-- | include/roamer.h | 1 | ||||
| -rw-r--r-- | include/wild_pokemon_area.h | 6 |
6 files changed, 30 insertions, 2 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 989b27387..a354320c2 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -39,8 +39,8 @@ #define VAR_0x4021 0x4021 #define VAR_ICE_STEP_COUNT 0x4022 #define VAR_0x4023 0x4023 -#define VAR_MIRAGE_RND_H 0x4024 -#define VAR_MIRAGE_RND_L 0x4025 +#define VAR_0x4024 0x4024 +#define VAR_0x4025 0x4025 #define VAR_SECRET_BASE_MAP 0x4026 #define VAR_0x4027 0x4027 #define VAR_0x4028 0x4028 diff --git a/include/field_specials.h b/include/field_specials.h index b48dd34a5..2abe168e0 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -23,5 +23,6 @@ void set_unknown_box_id(u8); u16 get_unknown_box_id(void); bool8 sub_80CC7B4(void); u16 GetHiddenItemAttr(struct HiddenItemStruct hiddenItem, u8 attr); +u8 GetUnlockedSeviiAreas(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/gba/types.h b/include/gba/types.h index 9f2594703..7163f925f 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -68,6 +68,10 @@ struct OamData /*0x06*/ u16 affineParam; }; +#define ST_OAM_HFLIP 0x08 +#define ST_OAM_VFLIP 0x10 +#define ST_OAM_MNUM_FLIP_MASK 0x18 + #define ST_OAM_OBJ_NORMAL 0 #define ST_OAM_OBJ_BLEND 1 #define ST_OAM_OBJ_WINDOW 2 diff --git a/include/pokedex_area_markers.h b/include/pokedex_area_markers.h new file mode 100644 index 000000000..da73fd529 --- /dev/null +++ b/include/pokedex_area_markers.h @@ -0,0 +1,16 @@ +#ifndef GUARD_POKEDEX_AREA_MARKERS_H +#define GUARD_POKEDEX_AREA_MARKERS_H + +struct PAM_TaskData +{ + struct SubspriteTable subsprites; + void * buffer; + u8 unk_0C; + u8 spr_id; + u16 tilesTag; + u16 unk_10; +}; + +void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites); + +#endif //GUARD_POKEDEX_AREA_MARKERS_H diff --git a/include/roamer.h b/include/roamer.h index 5ec0a17fc..1d23ff605 100644 --- a/include/roamer.h +++ b/include/roamer.h @@ -15,5 +15,6 @@ u8 TryStartRoamerEncounter(void); void UpdateRoamerHPStatus(struct Pokemon *mon); void SetRoamerInactive(void); void GetRoamerLocation(u8 *mapGroup, u8 *mapNum); +u16 GetRoamerLocationMapSectionId(void); #endif // GUARD_ROAMER_H diff --git a/include/wild_pokemon_area.h b/include/wild_pokemon_area.h new file mode 100644 index 000000000..354683408 --- /dev/null +++ b/include/wild_pokemon_area.h @@ -0,0 +1,6 @@ +#ifndef GUARD_WILD_POKEMON_AREA_H +#define GUARD_WILD_POKEMON_AREA_H + +s32 BuildPokedexAreaSubspriteBuffer(u16 species, struct Subsprite * subsprites); + +#endif //GUARD_WILD_POKEMON_AREA_H |