Clean up

pret · Aug 31, 2023 · 6884a5c · 6884a5c
1 parent 9826f3f
commit 6884a5c
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 74 deletions.
diff --git a/include/functions.h b/include/functions.h
@@ -165,7 +165,7 @@ extern void sub_F6E0(void);
 //extern ? sub_F74C();
 //extern ? sub_F8B0();
 //extern ? sub_FAE8();
-//extern ? sub_FD20();
+extern s8 sub_FD20(void);
 extern void sub_FD5C(void (*func)(void));
 extern void sub_FE04(void (*func)(void));
 //extern ? sub_FEB8();
@@ -772,7 +772,7 @@ extern void sub_4F814();
 
 //extern ? sub_528AC();
 //extern ? sub_528DC();
-//extern ? sub_5291C();
+extern void sub_5291C(u16, s8, s8, u8);
 //extern ? sub_52940();
 extern void SaveFile_LoadGameData(void);
 //extern ? LoadSaveDataFromSram();

diff --git a/include/types.h b/include/types.h
@@ -40,4 +40,13 @@ struct Coord16
     u16 y;
 };
 
+struct PokemonSpecies {
+    u16 mainSeriesIndexNumber; // Refers to the generation three internal index number; e.g. Treecko is 0x115 (decimal 227).
+    u8 unk2[0x5];
+    u8 name[10];
+    u8 unk11[0x4];
+    u8 evolutionTarget; // Uses the standard index numbers; e.g. Treecko is 0x00 (SPECIES_TREECKO)
+    u8 unk16[0x2];
+};
+
 #endif  // GUARD_TYPES_H
diff --git a/include/variables.h b/include/variables.h
@@ -188,4 +188,61 @@ extern struct Coord16 gUnknown_086A9694[];
 extern struct Coord16 gUnknown_086A96AC[];
 extern struct Coord16 gUnknown_086A96C0[];
 
+extern u16 gUnknown_02019C40[];
+extern s16 gUnknown_0201A514;
+extern s16 gUnknown_0202ADE0;
+extern s16 gUnknown_0202BEB8;
+extern s16 gUnknown_0202C5B0;
+
+extern StateFunc gPokedexStateFuncs[];
+extern u16 gUnknown_08081F20[];
+extern u16 gUnknown_08082720[];
+extern u16 gUnknown_08087340[];
+extern u16 gUnknown_08087B40[];
+extern u16 gUnknown_08088F60[];
+extern u16 gUnknown_08089760[];
+extern u8 gUnknown_08089960[];
+extern u8 gUnknown_08089B60[];
+
+extern s16 gUnknown_0201A448;
+extern s16 gUnknown_0202BF00;
+extern s16 gUnknown_0202A57C;
+extern s16 gUnknown_0201A4F0;
+extern s16 gUnknown_0202BE20;
+extern s16 gUnknown_0202C58C;
+extern s8 gUnknown_02019C24;
+extern s16 gUnknown_0202BF0C;
+extern s16 gUnknown_0201A440;
+extern s16 gUnknown_0202BEF4;
+extern s16 gUnknown_0202A588;
+extern s16 gUnknown_0202A55C;
+extern s16 gUnknown_0202A568[2];
+extern s16 gUnknown_0202C5E8;
+extern s16 gUnknown_0202A558;
+extern s8 gUnknown_0202BEE0;
+extern s8 gUnknown_0202BF04;
+extern s16 gUnknown_0202BF14;
+extern s8 gUnknown_0202C590;
+extern s16 gUnknown_0201B120;
+extern s8 gUnknown_0202BEC4;
+extern s8 gUnknown_0202BEFC;
+extern s8 gUnknown_02002830;
+extern s8 gUnknown_02002831;
+extern s8 gUnknown_0202C794;
+extern s8 gUnknown_0201C1B4;
+extern s8 gUnknown_0202C5AC;
+extern s8 gUnknown_02019C28;
+extern s16 gUnknown_0202A1C0[];
+extern s16 gUnknown_0202A390[];
+extern s16 gUnknown_0202A574;
+
+extern u16 gUnknown_0805C840[];
+extern u16 gUnknown_0805C780[];
+extern u16 gUnknown_0805C7C0[];
+extern u8 gUnknown_0202A590[];
+extern u16 gUnknown_08086B40[];
+extern s16 gUnknown_086A61BC[];
+
+extern struct PokemonSpecies gUnknown_086A3700[];
+
 #endif  // GUARD_VARIABLES_H
diff --git a/src/pokedex.c b/src/pokedex.c
@@ -3,57 +3,8 @@
 #include "functions.h"
 #include "m4a.h"
 #include "main.h"
-
-extern u16 gUnknown_02019C40[];
-extern s16 gUnknown_0201A514;
-extern s16 gUnknown_0202ADE0;
-extern s16 gUnknown_0202BEB8;
-extern s16 gUnknown_0202C5B0;
-
-extern StateFunc gPokedexStateFuncs[];
-extern u16 gUnknown_08081F20[];
-extern u16 gUnknown_08082720[];
-extern u16 gUnknown_08087340[];
-extern u16 gUnknown_08087B40[];
-extern u16 gUnknown_08088F60[];
-extern u16 gUnknown_08089760[];
-extern u16 gUnknown_08089960[];
-extern u16 gUnknown_08089B60[];
-
-extern s16 gUnknown_0201A448;
-extern s16 gUnknown_0202BF00;
-extern s16 gUnknown_0202A57C;
-extern s16 gUnknown_0201A4F0;
-extern s16 gUnknown_0202BE20;
-extern s16 gUnknown_0202C58C;
-extern s8 gUnknown_02019C24;
-extern s16 gUnknown_0202BF0C;
-extern s16 gUnknown_0201A440;
-extern s16 gUnknown_0202BEF4;
-extern s16 gUnknown_0202A588;
-extern s16 gUnknown_0202A55C;
-extern s16 gUnknown_0202A568[2];
-extern s16 gUnknown_0202C5E8;
-extern s16 gUnknown_0202A558;
-extern s8 gUnknown_0202BEE0;
-extern s8 gUnknown_0202BF04;
-extern s16 gUnknown_0202BF14;
-extern s8 gUnknown_0202C590;
-extern s16 gUnknown_0201B120;
-extern s8 gUnknown_0202BEC4;
-extern s8 gUnknown_0202BEFC;
-extern s8 gUnknown_02002830;
-extern s8 gUnknown_02002831;
-extern s8 gUnknown_0202C794;
-extern s8 gUnknown_0201C1B4;
-extern s8 gUnknown_0202C5AC;
-extern s8 gUnknown_02019C28;
-extern s16 gUnknown_0202A1C0[];
-extern s16 gUnknown_0202A390[];
-extern s16 gUnknown_0202A574;
-
-void sub_88E4(void);
-s8 sub_FD20(void);
+#include "types.h"
+#include "variables.h"
 
 void sub_4F50(void);
 void sub_5174(void);
@@ -63,26 +14,8 @@ void sub_4D74(void);
 void sub_4FC8(void);
 void sub_5064(void);
 void sub_51CC(void);
-
-extern u8 gUnknown_0202A590[];
-
-extern u16 gUnknown_08086B40[];
-
 void sub_70E0(s16, s32);
-
-extern void sub_5291C(u16, s8, s8, u8);
-
-struct Unk086A3700 {
-    u16 unk0;
-    u8 unk2[0x16];
-};
-
-extern struct Unk086A3700 gUnknown_086A3700[];
-extern u16 gUnknown_0805C840[];
-extern u16 gUnknown_0805C780[];
-extern u16 gUnknown_0805C7C0[];
-
-extern s16 gUnknown_086A61BC[];
+void sub_88E4(void);
 
 void PokedexMain(void)
 {
@@ -399,7 +332,7 @@ void sub_4428(void) {
         DmaCopy16(3, gUnknown_08086B40, (void *)0x6000280, 2*0xE0);
         sub_70E0(gUnknown_0202ADE0, gUnknown_0202C794);
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x40);
-        sub_5291C(gUnknown_086A3700[gUnknown_0202ADE0].unk0, 0, 0x7F, 10);
+        sub_5291C(gUnknown_086A3700[gUnknown_0202ADE0].mainSeriesIndexNumber, 0, 0x7F, 10);
         gMain.subState = 5;
     }
 

diff --git a/src/pokedex_end.c b/src/pokedex_end.c
@@ -3,7 +3,7 @@
 
 extern s16 gUnknown_0202A1C0[];
 extern s16 gUnknown_0202A588;
-extern s32 gUnknown_0202BF14;
+extern s16 gUnknown_0202BF14;
 
 extern s16 gUnknown_086A61BC[];