summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/constants/species.h2
-rwxr-xr-xinclude/global.h28
-rwxr-xr-xinclude/main.h18
3 files changed, 40 insertions, 8 deletions
diff --git a/include/constants/species.h b/include/constants/species.h
index 59f9ff2..7fc56bf 100755
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -208,4 +208,6 @@
#define SPECIES_AERODACTYL 0xCC
#define SPECIES_NONE 0xCD
+#define BONUS_SPECIES_START SPECIES_CHIKORITA
+
#endif // GUARD_CONSTANTS_SPECIES_H
diff --git a/include/global.h b/include/global.h
index e7132a4..16b8e51 100755
--- a/include/global.h
+++ b/include/global.h
@@ -56,4 +56,32 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b))
+struct PinballGame
+{
+ /*0x000*/ u8 filler0[0x35];
+ /*0x035*/ s8 area;
+ /*0x036*/ u8 filler36[0xF5];
+ /*0x12B*/ s8 unk12B;
+ /*0x12C*/ u8 filler12C[0x2];
+ /*0x12E*/ s16 unk12E;
+ /*0x130*/ s16 unk130[8];
+ /*0x140*/ u8 filler140[0x458];
+ /*0x598*/ u16 catchModeSpecies;
+ /*0x59A*/ u8 filler59A[0x2];
+ /*0x59C*/ u16 unk59C;
+ /*0x59E*/ u8 filler59E[0x52];
+ /*0x5F0*/ u16 unk5F0;
+ /*0x5F2*/ u8 filler5F2[0x14B];
+ /*0x73D*/ s8 unk73D;
+};
+
+struct Unk02031520
+{
+ /*0x0*/ u8 filler0[0x8];
+ /*0x8*/ s16 unk8;
+};
+
+extern struct PinballGame *gUnknown_020314E0;
+extern struct Unk02031520 gUnknown_02031520;
+
#endif // GUARD_GLOBAL_H
diff --git a/include/main.h b/include/main.h
index e27249d..df03d5d 100755
--- a/include/main.h
+++ b/include/main.h
@@ -42,7 +42,11 @@ struct Main
/*0x00*/ u8 filler0[0x2];
/*0x02*/ u8 mainState;
/*0x03*/ u8 subState;
- /*0x04*/ u8 filler4[0x9];
+ /*0x04*/ u8 unk4;
+ /*0x05*/ u8 filler5[0x2];
+ /*0x07*/ s8 unk7;
+ /*0x08*/ s8 unk8;
+ /*0x09*/ u8 filler9[0x4];
/*0x0D*/ u8 unkD;
/*0x0E*/ u8 fillerE[0x1];
/*0x0F*/ u8 unkF;
@@ -73,19 +77,16 @@ struct Main
/*0x48*/ int rngValue;
/*0x4C*/ int unk4C;
/*0x50*/ int unk50;
- /*0x54*/ u8 filler54[0x294];
+ /*0x54*/ u8 filler54[0x20];
+ /*0x74*/ u8 pokedexFlags[204];
+ /*0x140*/ u8 filler140[0x1A8];
/*0x2E8*/ struct MainUnk2E8 unk2E8[4];
/*0x2F8*/ struct SpriteGroup spriteGroups[NUM_SPRITE_GROUPS];
};
-struct Unk0200B134
-{
- /*0x00*/ u8 filler0[0xCD];
- /*0xCD*/ u8 unkCD;
-};
extern struct Main gMain;
-extern struct Unk0200B134 gUnknown_0200B134;
+extern u8 gUnknown_0200B134[];
extern struct SpriteGroup gUnknown_0200B3B8[];
extern u32 IntrMain_Buffer[0x200];
extern u32 IntrMain[];
@@ -120,6 +121,7 @@ void sub_2B4(void);
void sub_490(void);
void sub_518(void);
void sub_578(void);
+u32 Random(void);
void sub_CBC(void);
void sub_D10(void);
void sub_D74(void);