diff options
Diffstat (limited to 'include')
| -rwxr-xr-x[-rw-r--r--] | include/pokenav.h | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/include/pokenav.h b/include/pokenav.h index 5fffc91fb..a35bd3117 100644..100755 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -10,11 +10,17 @@ struct UnkPokenavStruct_Sub1 { /*0x00*/ void (*unk0)(void); /*0x04*/ MainCallback callback; /*0x08*/ struct Pokeblock *pokeblock; - /*0x0C*/ u8 fillerC[0x44]; + /*0x0C*/ struct Pokemon *pokemon; + /*0x10*/ u8 fillerC[0x40]; /*0x50*/ u8 unk50; - /*0x51*/ u8 unk51[4]; - /*0x56*/ u8 unk55; + /*0x51*/ u8 unk51; + /*0x52*/ u8 unk52; + /*0x53*/ u8 unk53; + /*0x54*/ u8 unk54; + /*0x55*/ u8 unk55; /*0x56*/ u8 unk56; + /*0x57*/ u8 fil57[5]; + /*0x5c*/ u8 unk5c[1]; }; struct UnkPokenavStruct_Sub2 { @@ -22,6 +28,11 @@ struct UnkPokenavStruct_Sub2 { /*0x26*/ u16 unk26; }; +struct UnkUsePokeblockSub { + /*0*/ u8 fil0[2]; + /*2*/ u8 partyIdx:5; +}; + struct UnkPokenavStruct { /*0x0000*/ u8 filler0000[0x30c]; /*0x0000*/ u16 unk030C; @@ -38,11 +49,15 @@ struct UnkPokenavStruct { /*0x87E0*/ void *unk87E0; /*0x87E4*/ u8 filler87E4[0x44]; /*0x8828*/ u8 unk8828; - /*0x8829*/ u8 filler8829[0x7c7]; + /*0x8829*/ u8 filler8829[0x113]; + /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab]; + /*0x8fe8*/ u8 fil8fe8[1]; + /*0x8fe9*/ s8 unk8fe9; + /*0x8fea*/ u8 fil8fea[6]; /*0x8ff0*/ u8 unk8ff0; /*0x8ff1*/ u8 filler8ff1[0x13]; - /*0x9004*/ u8 unk9004; - /*0x9005*/ u8 filler9005[0x33f]; + /*0x9004*/ u8 unk9004[3][20]; + /*0x9040*/ u8 unk9040[0x304]; /*0x9344*/ u8 unk9344; /*0x9345*/ u8 filler9345[0x3ba3]; /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[78]; @@ -76,5 +91,8 @@ void sub_80EBA5C(void); void sub_80F5060(bool8); void move_anim_execute(void); bool8 gpu_sync_bg_show(void); +void sub_80F5550(void *, void *); +bool8 sub_80F555C(void); +void sub_80F7224(u8); #endif // GUARD_POKENAV_H |