diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bg.h | 4 | ||||
| -rw-r--r-- | include/gba/defines.h | 3 | ||||
| -rw-r--r-- | include/pokedex.h | 41 | ||||
| -rw-r--r-- | include/tileset_anims.h | 9 |
4 files changed, 45 insertions, 12 deletions
diff --git a/include/bg.h b/include/bg.h index 70ec38275..aa26614c3 100644 --- a/include/bg.h +++ b/include/bg.h @@ -104,14 +104,14 @@ void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); u16 GetBgMetricTextMode(u8 bg, u8 whichMetric); u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric); u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 screenHeight); -void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2); +void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2); u32 GetBgType(u8 bg); bool32 IsInvalidBg32(u8 bg); bool32 IsTileMapOutsideWram(u8 bg); diff --git a/include/gba/defines.h b/include/gba/defines.h index 5489f9e14..3932a8542 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -62,6 +62,9 @@ #define TILE_SIZE_4BPP 32 #define TILE_SIZE_8BPP 64 +#define TILE_OFFSET_4BPP(n) ((n) * TILE_SIZE_4BPP) +#define TILE_OFFSET_8BPP(n) ((n) * TILE_SIZE_8BPP) + #define TOTAL_OBJ_TILE_COUNT 1024 #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) diff --git a/include/pokedex.h b/include/pokedex.h index c4ec27e0b..718d2e853 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,15 +1,15 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H -#include "global.h" +#define KANTO_DEX_COUNT 151 +#define HOENN_DEX_COUNT 202 +#define NATIONAL_DEX_COUNT 386 -void ResetPokedex(void); -void CopyMonCategoryText(u16 species, u8 *dst); -u16 GetPokedexHeightWeight(u16 dexNum, u8 data); -u16 GetNationalPokedexCount(u8); -u16 GetKantoPokedexCount(u8); -bool16 HasAllKantoMons(void); -u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); +enum +{ + DEX_MODE_KANTO, + DEX_MODE_NATIONAL +}; enum { @@ -19,9 +19,30 @@ enum FLAG_SET_CAUGHT }; +struct PokedexEntry +{ + /*0x00*/ u8 categoryName[12]; + /*0x0C*/ u16 height; //in decimeters + /*0x0E*/ u16 weight; //in hectograms + /*0x10*/ const u8 *description; + /*0x14*/ const u8 *unusedDescription; + /*0x18*/ u16 unused; + /*0x1A*/ u16 pokemonScale; + /*0x1C*/ u16 pokemonOffset; + /*0x1E*/ u16 trainerScale; + /*0x20*/ u16 trainerOffset; +}; /*size = 0x24*/ + +void ResetPokedex(void); +void CopyMonCategoryText(u16 species, u8 *dst); +u16 GetPokedexHeightWeight(u16 dexNum, u8 data); +u16 GetNationalPokedexCount(u8); +u16 GetKantoPokedexCount(u8); +bool16 HasAllMons(void); +u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); -u16 pokedex_count(u8); +u16 GetNationalPokedexCount(u8); u16 sub_80C0844(u8); -u16 sub_8088EDC(u8); +u16 GetKantoPokedexCount(u8); #endif // GUARD_POKEDEX_H diff --git a/include/tileset_anims.h b/include/tileset_anims.h new file mode 100644 index 000000000..0e515f044 --- /dev/null +++ b/include/tileset_anims.h @@ -0,0 +1,9 @@ +#ifndef GUARD_TILESET_ANIMS_H +#define GUARD_TILESET_ANIMS_H + +void InitTilesetAnimations(void); +void InitSecondaryTilesetAnimation(void); +void UpdateTilesetAnimations(void); +void TransferTilesetAnimsBuffer(void); + +#endif // GUARD_TILESET_ANIMS_H |