Merge pull request #596 from PikalaxALT/watanabe

Watanabe

4 files changed, 33 insertions, 0 deletions

diff --git a/include/battle.h b/include/battle.h
index dab18f5c5..b1677d90a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -725,6 +725,10 @@ void MarkBufferBankForExecution(u8 bank);
 
 extern u8 gBattleTextBuff1[];
 
+extern u16 gBattleTypeFlags;
+extern u8 gUnknown_02023A14_50;
+extern u16 gTrainerBattleOpponent;
+
 // src/battle_bg.o
 void sub_800D6D4();
 void ApplyPlayerChosenFrameToBattleMenu();
diff --git a/include/battle_bg.h b/include/battle_bg.h
new file mode 100644
index 000000000..8cbc74604
--- /dev/null
+++ b/include/battle_bg.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_BG_H
+#define GUARD_BATTLE_BG_H
+
+void debug_sub_800D684(void);
+
+#endif //GUARD_BATTLE_BG_H
diff --git a/include/pokedex.h b/include/pokedex.h
index 9158a97f0..f051b4afe 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -27,4 +27,25 @@ bool16 CompletedNationalPokedex(void);
 
 extern bool8 gUnknown_03005CE8;
 
+struct PokedexEntry
+{
+    /*0x00*/ u8 categoryName[12];
+    /*0x0C*/ u16 height; //in decimeters
+    /*0x0E*/ u16 weight; //in hectograms
+    /*0x10*/ const u8 *descriptionPage1;
+    /*0x14*/ const u8 *descriptionPage2;
+    /*0x18*/ u16 unused;
+    /*0x1A*/ u16 pokemonScale;
+    /*0x1C*/ u16 pokemonOffset;
+    /*0x1E*/ u16 trainerScale;
+    /*0x20*/ u16 trainerOffset;
+};  /*size = 0x24*/
+
+extern const struct PokedexEntry gPokedexEntries[];
+
+u16 sub_8091A4C(u16 gender, s16 x, s16 y, u16 paletteNum);
+u16 sub_80918EC(u16 num, s16 x, s16 y, u16 paletteNum);
+
+void sub_8091738(u16, u16, u16);
+
 #endif // GUARD_POKEDEX_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index c6c37c123..9c8fbdc13 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -300,4 +300,6 @@ void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u1
 void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height);
 void ShowPokemonStorageSystem(void);
 
+void debug_sub_80A433C(struct Pokemon *pokemon, void (*func)(void));
+
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H