summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-06-12 14:36:40 -0500
committercamthesaxman <cameronghall@cox.net>2017-06-12 14:36:40 -0500
commit95c56943995bbae7688b581a6b6d084e215827f4 (patch)
tree1fb53d54a5955e18c5a097667509d1cefb8afa3d /include
parentb741c626e72a2c52351fddbbfc536f66183d009f (diff)
decompile sub_8090750 - sub_8091304
Diffstat (limited to 'include')
-rw-r--r--include/pokedex.h12
-rw-r--r--include/songs.h10
2 files changed, 11 insertions, 11 deletions
diff --git a/include/pokedex.h b/include/pokedex.h
index 61597981b..d046fbcd4 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -45,7 +45,7 @@ struct PokedexView
u8 unk64B;
u8 unk64C_1:1;
u8 selectedScreen;
- u8 unk64E;
+ u8 unk64E; // description page
u8 unk64F;
u8 menuIsOpen; //menuIsOpen
u8 unk651;
@@ -133,7 +133,7 @@ void sub_8090750(u8);
void sub_8090A3C(u8);
void sub_8090C68(void);
-u8 *GetPokemonCategory(u16);
+const u8 *GetPokemonCategory(u16);
s8 sub_8090D90(u16, u8);
u16 GetNationalPokedexCount(u8);
@@ -141,10 +141,10 @@ u16 GetHoennPokedexCount(u8);
bool8 sub_8090FC0(void);
u16 sub_8090FF4(void);
void sub_8091060(u16);
-void sub_8091154(u16 order, int i, int i1);
-void sub_80911C8(u16 num, int i, int i1);
-void sub_8091260(u16 num, int i, int i1, int i2);
-void sub_8091304(u8 name[12], int i, int i1);
+void sub_8091154(u16 order, u8, u8);
+u8 sub_80911C8(u16 num, u8, u8);
+u8 sub_8091260(u16 num, u8, u8, u8);
+void sub_8091304(u8 *name, u8, u8);
void sub_8091458(u16 height, int i, int i1);
void sub_8091564(u16 weight, int i, int i1);
diff --git a/include/songs.h b/include/songs.h
index d7829479f..9fd4bb687 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -20,11 +20,11 @@ enum
/*0x0E*/ SE_KOUKA_H,
/*0x0F*/ SE_BOWA2,
/*0x10*/ SE_POKE_DEAD,
- SE_NIGERU,
- SE_JIDO_DOA,
- SE_NAMINORI,
- SE_BAN,
- SE_PIN,
+ /*0x11*/ SE_NIGERU,
+ /*0x12*/ SE_JIDO_DOA,
+ /*0x13*/ SE_NAMINORI,
+ /*0x14*/ SE_BAN,
+ /*0x15*/ SE_PIN,
SE_BOO,
SE_BOWA,
SE_JYUNI,