From 9ceff166bca9d2fcd58fe3f8c1e898f8d0d1fb0f Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 1 Aug 2019 18:13:09 -0700 Subject: Dump and convert Pokedex Entries and Text to C. --- include/pokedex.h | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/pokedex.h b/include/pokedex.h index c4ec27e0b..0cd52e64d 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,15 +1,14 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H -#include "global.h" +#define KANTO_DEX_COUNT 151 +#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_HOENN, + DEX_MODE_NATIONAL +}; enum { @@ -19,6 +18,27 @@ 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 HasAllKantoMons(void); +u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 pokedex_count(u8); u16 sub_80C0844(u8); -- cgit v1.2.3 From bbc7c6ccfc7d59f61f406849f752fdd5038a6a80 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 4 Aug 2019 15:11:02 -0700 Subject: Port pokedex.c --- include/pokedex.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/pokedex.h b/include/pokedex.h index 0cd52e64d..718d2e853 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -2,11 +2,12 @@ #define GUARD_POKEDEX_H #define KANTO_DEX_COUNT 151 +#define HOENN_DEX_COUNT 202 #define NATIONAL_DEX_COUNT 386 enum { - DEX_MODE_HOENN, + DEX_MODE_KANTO, DEX_MODE_NATIONAL }; @@ -37,11 +38,11 @@ void CopyMonCategoryText(u16 species, u8 *dst); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); u16 GetNationalPokedexCount(u8); u16 GetKantoPokedexCount(u8); -bool16 HasAllKantoMons(void); +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 -- cgit v1.2.3 From 7ae9d90566600ecda6dc24e5a1369203f48d4a19 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 5 Aug 2019 01:00:59 -0700 Subject: Decompile tileset_anims --- include/gba/defines.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') 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)) -- cgit v1.2.3 From fe81e11f491c4ee0d9047907f20b3a0753587284 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 5 Aug 2019 15:08:14 -0700 Subject: Fix formatting and add tileset_anims.h --- include/tileset_anims.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/tileset_anims.h (limited to 'include') diff --git a/include/tileset_anims.h b/include/tileset_anims.h new file mode 100644 index 000000000..f6554e1de --- /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 \ No newline at end of file -- cgit v1.2.3 From d92bc9a257477b7ee0ac9b9cd047e1c45d12febd Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 5 Aug 2019 16:04:42 -0700 Subject: Fix formatting of tileset_anims.h --- include/tileset_anims.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/tileset_anims.h b/include/tileset_anims.h index f6554e1de..0e515f044 100644 --- a/include/tileset_anims.h +++ b/include/tileset_anims.h @@ -6,4 +6,4 @@ void InitSecondaryTilesetAnimation(void); void UpdateTilesetAnimations(void); void TransferTilesetAnimsBuffer(void); -#endif // GUARD_TILESET_ANIMS_H \ No newline at end of file +#endif // GUARD_TILESET_ANIMS_H -- cgit v1.2.3 From 82253083e355269c213a064e13940860be68e198 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 12 Aug 2019 12:37:41 +0800 Subject: match CopyTileMapEntry with goto --- include/bg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/bg.h b/include/bg.h index 40c51167f..6a77ec22e 100644 --- a/include/bg.h +++ b/include/bg.h @@ -97,7 +97,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt 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); -- cgit v1.2.3 From d6de2fd5c0cfe97a72b70a5eae29d01680bd707b Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 12 Aug 2019 12:48:01 +0800 Subject: match CopyRectToBgTilemapBufferRect from pokeemerald --- include/bg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/bg.h b/include/bg.h index 6a77ec22e..0d6b0e171 100644 --- a/include/bg.h +++ b/include/bg.h @@ -90,7 +90,7 @@ 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); -- cgit v1.2.3