diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokenav.h | 47 | ||||
| -rw-r--r-- | include/region_map.h | 8 |
2 files changed, 44 insertions, 11 deletions
diff --git a/include/pokenav.h b/include/pokenav.h index ab7b32d7c..f77f93e2d 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H +#include "region_map.h" + struct UnkPokenavStruct_Sub { /*0x0*/ u16 unk0; /*0x2*/ u8 filler2[6]; @@ -37,28 +39,54 @@ struct UnkPokenavStruct_Sub3 { struct UnkUsePokeblockSub { /*0*/ u8 fil0[2]; /*2*/ u8 partyIdx:5; + /*2*/ u16 unk2:9; }; struct UnkPokenavStruct { - /*0x0000*/ u8 filler0000[0x30C]; + /*0x0000*/ u8 filler0000[0x306]; + /*0x0306*/ u16 unk306; + /*0x0306*/ u8 filler0308[0x4]; /*0x030C*/ union { // TODO: what? u16 val; struct UnkPokenavStruct_Sub3 unk030C; } unk030C; - /*0x0310*/ u8 filler030E[0x6a9c]; + /*0x0310*/ u8 filler030E[0x6a90]; + /*0x6DA0*/ u16 unk6DA0; + /*0x6DA2*/ u16 unk6DA2; + /*0x6DA4*/ u16 taskId6DA4; + /*0x6DA6*/ u8 filler6DA6[0x6]; /*0x6DAC*/ u8 unk6DAC; - /*0x6DAD*/ u8 filler6DAD[0x8fd]; + /*0x6DAD*/ u8 filler6DAD[0x6B]; + /*0x6E18*/ struct RegionMap regionMap; + /*0x7698*/ u16 unk7698; + /*0x769A*/ u16 unk769A; + /*0x769C*/ u8 unk769C; + /*0x769D*/ u8 unk769D; + /*0x769E*/ u8 unk769E; + /*0x769F*/ u8 filler769F[0xB]; /*0x76AA*/ u8 unk76AA; /*0x76AB*/ u8 filler76AB[0x10bd]; /*0x8768*/ struct UnkPokenavStruct_Sub2 *unk8768; - /*0x876C*/ u8 filler876C[0x6e]; + /*0x876C*/ u8 filler876C[0x2]; + /*0x876E*/ u8 unk876E; + /*0x876F*/ u8 filler876F[0x7]; + /*0x8776*/ u16 unk8776; + /*0x8778*/ u16 unk8778; + /*0x877A*/ u8 filler877A[0xE]; + /*0x8788*/ u8 unk8788[0x40]; + /*0x87C8*/ u8 unk87C8; + /*0x87C9*/ u8 filler87C9; + /*0x87CA*/ u8 unk87CA; + /*0x87CB*/ u8 filler87CB[0xF]; /*0x87DA*/ s16 unk87DA; /*0x87DC*/ s16 unk87DC; /*0x87DE*/ s16 unk87DE; /*0x87E0*/ void *unk87E0; /*0x87E4*/ u8 filler87E4[0x44]; /*0x8828*/ u8 unk8828; - /*0x8829*/ u8 filler8829[0x113]; + /*0x8829*/ u8 unk8829[3][64]; + /*0x88E9*/ u8 unk88E9[3][24]; + /*0x8931*/ u8 unk8931[11]; /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab]; /*0x8fe8*/ u8 fil8fe8[1]; /*0x8fe9*/ s8 unk8fe9; @@ -68,11 +96,16 @@ struct UnkPokenavStruct { /*0x9004*/ u8 unk9004[3][20]; /*0x9040*/ u8 unk9040[0x304]; /*0x9344*/ u8 unk9344; - /*0x9345*/ u8 filler9345[0x3b07]; + /*0x9345*/ u8 filler9345[0x2955]; + /*0xBC9A*/ u8 unkBC9A; + /*0xBC9B*/ u8 unkBC9B; + /*0xBC9C*/ u8 unkBC9C[22][200]; + /*0xCDCC*/ const u8 *unkCDCC[16][2]; /*0xCE4C*/ u16 unkCE4C; /*0xCE4E*/ u16 unkCE4E; /*0xCE50*/ u16 unkCE50; - /*0xCE52*/ u16 palettesCE52[0x4B]; + /*0xCE52*/ u16 palettesCE52[30]; + /*0xCE8E*/ u16 palettesCE8E[0x2D]; /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[78]; /*0xD158*/ u16 unkD158; /*0xD15A*/ u8 fillerD15A[6]; diff --git a/include/region_map.h b/include/region_map.h index 3d970fa0a..4061c5e3d 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -3,8 +3,8 @@ struct RegionMap { - u8 mapSecName[0x14]; - u16 mapSecId; + u8 mapSectionName[20]; + u16 mapSectionId; u8 unk16; u8 everGrandeCityArea; u8 (*inputCallback)(void); @@ -62,10 +62,10 @@ void sub_80FAEC4(void); u8 sub_80FAFC0(void); void UpdateRegionMapVideoRegs(void); void sub_80FB2A4(s16, s16); -u16 sub_80FBA04(u16 mapSecId); +u16 sub_80FBA04(u16 mapSectionId); void CreateRegionMapCursor(u16, u16); void CreateRegionMapPlayerIcon(u16, u16); -const u8 *GetMapSectionName(u8 *dest, u16 mapSecId, u16 length); +const u8 *GetMapSectionName(u8 *dest, u16 mapSectionId, u16 length); const u8 *CopyMapName(u8 *dest, u16 b); const u8 *CopyLocationName(u8 *dest, u16 b); |