diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rwxr-xr-x | include/main.h | 22 | ||||
| -rw-r--r-- | include/variables.h | 2 |
3 files changed, 21 insertions, 7 deletions
diff --git a/include/functions.h b/include/functions.h index 6698a17..0606057 100644 --- a/include/functions.h +++ b/include/functions.h @@ -162,7 +162,7 @@ void SetMatrixScale(s16 xScale, s16 yScale, s16 matrixNum); //extern ? sub_F434(); //extern ? sub_F4FC(); //extern ? sub_F670(); -//extern ? sub_F6E0(); +extern void sub_F6E0(void); //extern ? sub_F74C(); //extern ? sub_F8B0(); //extern ? sub_FAE8(); @@ -384,7 +384,7 @@ extern void sub_1050C(void); //extern ? sub_88E4(); //extern ? sub_8974(); //extern ? sub_8A78(); -//extern ? sub_8ABC(); +extern void sub_8ABC(void); // asm/rom_1068C.s diff --git a/include/main.h b/include/main.h index 126f6c2..3e0c744 100755 --- a/include/main.h +++ b/include/main.h @@ -3,6 +3,20 @@ #include "global.h" +// This is probably permanently saved data like pokedex and high scores. +struct SaveData +{ + /*0x74*/ u8 pokedexFlags[204]; + /*0x140*/ u8 filler140[1]; + /*0x141*/ u8 unk141; + /*0x142*/ u8 unk142; + /*0x143*/ u8 unk143; + /*0x144*/ u8 filler144[0x2D8-0x144]; + s8 signature[10]; + u16 unk2E2; + u32 unk2E4; +}; + struct Main { /*0x00*/ u8 filler0[0x2]; @@ -12,7 +26,8 @@ struct Main /*0x05*/ u8 filler5[0x2]; /*0x07*/ s8 unk7; /*0x08*/ s8 unk8; - /*0x09*/ u8 filler9[0x4]; + /*0x09*/ u8 filler9[0x3]; + /*0x0C*/ u8 unkC; /*0x0D*/ u8 unkD; /*0x0E*/ u8 fillerE[0x1]; /*0x0F*/ u8 unkF; @@ -38,15 +53,14 @@ struct Main /*0x38*/ volatile u16 blendControl; /*0x3A*/ volatile u16 blendAlpha; /*0x3C*/ volatile u16 blendBrightness; - // may be a sub-struct. possibly save data? + // may be a sub-struct. possibly for saved game? /*0x40*/ int hasSavedGame; /*0x44*/ u8 filler44[0x4]; /*0x48*/ int rngValue; /*0x4C*/ int unk4C; /*0x50*/ int unk50; /*0x54*/ u8 filler54[0x20]; - /*0x74*/ u8 pokedexFlags[204]; - /*0x140*/ u8 filler140[0x1A8]; + /*0x74*/ struct SaveData saveData; /*0x2E8*/ struct MainUnk2E8 unk2E8[4]; /*0x2F8*/ struct SpriteGroup spriteGroups[NUM_SPRITE_GROUPS]; }; diff --git a/include/variables.h b/include/variables.h index 92bf425..590ae00 100644 --- a/include/variables.h +++ b/include/variables.h @@ -26,7 +26,7 @@ extern u8 gUnknown_02002808[]; //extern ? gUnknown_02002958; //extern ? gIntrTable; //extern ? gMain; -//extern ? gUnknown_0200B134; +//extern ? gMain+0x74; //extern ? gUnknown_0200B3B8; //extern ? gUnknown_0200FB98; //extern ? gUnknown_0200FB9C; |