Merge pull request #336 from h2o-DS/Pokedex_Menu_Text

Message_Bank_Pokedex and Pokedex_Height_Check
pret · Jan 21, 2025 · ac990fd · ac990fd
2 parents b48793e + d0ab817
commit ac990fd
Show file tree

Hide file tree

Showing 62 changed files with 1,576 additions and 1,593 deletions.
diff --git a/include/overlay021/funcptr_ov21_021E9B74.h b/include/overlay021/funcptr_ov21_021E9B74.h
@@ -4,6 +4,8 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-typedef void (*UnkFuncPtr_ov21_021E9B74)(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+typedef void (*UnkFuncPtr_ov21_021E9B74)(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 
 #endif // POKEPLATINUM_FUNCPTR_OV21_021E9B74_H
diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h
@@ -17,14 +17,15 @@
 
 #include "bg_window.h"
 #include "cell_actor.h"
+#include "heap.h"
 #include "overlay_manager.h"
 #include "strbuf.h"
 #include "touch_screen.h"
 
 int ov21_021D0D80(OverlayManager *param0, int *param1);
 int ov21_021D0E3C(OverlayManager *param0, int *param1);
 int ov21_021D0EC8(OverlayManager *param0, int *param1);
-UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80 *param1);
+UnkStruct_ov21_021D0F60 *ov21_021D0F60(enum HeapId heapID, const UnkStruct_ov21_021D0D80 *param1);
 BOOL ov21_021D10B8(UnkStruct_ov21_021D0F60 *param0);
 void ov21_021D12B0(int param0);
 void ov21_021D12C4(void);
@@ -70,6 +71,6 @@ u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320
 u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
 u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
 u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-Strbuf *ov21_021D1CE0(int param0, int param1);
+Strbuf *GetPokedexMessage(int entryID, enum HeapId heapID);
 
 #endif // POKEPLATINUM_OV21_021D0D80_H
diff --git a/include/overlay021/ov21_021D3FE0.h b/include/overlay021/ov21_021D3FE0.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D3FE0_decl.h"
 #include "overlay021/struct_ov21_021D4008.h"
 
-UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(int param0);
+#include "heap.h"
+
+UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(enum HeapId heapID);
 void ov21_021D4008(UnkStruct_ov21_021D3FE0 *param0, const UnkStruct_ov21_021D4008 *param1);
 int ov21_021D4078(UnkStruct_ov21_021D3FE0 *param0);
 int ov21_021D4100(UnkStruct_ov21_021D3FE0 *param0);

diff --git a/include/overlay021/ov21_021D423C.h b/include/overlay021/ov21_021D423C.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D423C_decl.h"
 #include "overlay021/struct_ov21_021D4660.h"
 
-UnkStruct_ov21_021D423C *ov21_021D423C(int param0);
+#include "heap.h"
+
+UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID);
 void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2);
 const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1);
 BOOL ov21_021D42D4(UnkStruct_ov21_021D423C *param0);

diff --git a/include/overlay021/ov21_021D4340.h b/include/overlay021/ov21_021D4340.h
@@ -5,24 +5,26 @@
 #include "overlay021/struct_ov21_021D4340_1.h"
 #include "overlay021/struct_ov21_021D4660.h"
 
+#include "heap.h"
+
 BOOL ov21_021D4340(UnkStruct_ov21_021D4340_1 *param0);
 BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0);
 BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0);
 BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 *param0);
 void ov21_021D4660(UnkStruct_ov21_021D4660 *param0);
-void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, int param2, int param3);
-void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
-void ov21_021D4BB4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID, int param3);
+void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
+void ov21_021D4BB4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3);
 
 #endif // POKEPLATINUM_OV21_021D4340_H
diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h
@@ -17,7 +17,7 @@ void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 *param0);
 void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0);
 Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2);
 void ov21_021D4DA0(Window *param0);
-u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5);
+u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset);
 void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3);
 void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4);
 

diff --git a/include/overlay021/ov21_021D4EE4.h b/include/overlay021/ov21_021D4EE4.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 #include "overlay021/struct_ov21_021D4FE4.h"
 
-UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(int param0);
+#include "heap.h"
+
+UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(enum HeapId heapID);
 void ov21_021D4EFC(UnkStruct_ov21_021D4EE4 *param0);
 void ov21_021D4F04(UnkStruct_ov21_021D4EE4 *param0, const UnkStruct_ov21_021D4FE4 *param1, int param2, int param3);
 void ov21_021D4F20(UnkStruct_ov21_021D4EE4 *param0, int param1, int param2);

diff --git a/include/overlay021/ov21_021D5AEC.h b/include/overlay021/ov21_021D5AEC.h
@@ -5,7 +5,9 @@
 #include "overlay021/struct_ov21_021D5B68.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021D5B50(UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0);
 

diff --git a/include/overlay021/ov21_021D76B0.h b/include/overlay021/ov21_021D76B0.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021D7710(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021D76B0_H
diff --git a/include/overlay021/ov21_021D85B0.h b/include/overlay021/ov21_021D85B0.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021D8610(UnkStruct_ov21_021E68F4 *param0);
 void ov21_021D8628(UnkStruct_ov21_021E68F4 *param0, int param1);
 int ov21_021D863C(const UnkStruct_ov21_021E68F4 *param0);

diff --git a/include/overlay021/ov21_021D94BC.h b/include/overlay021/ov21_021D94BC.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021D951C(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021D94BC_H
diff --git a/include/overlay021/ov21_021DC9BC.h b/include/overlay021/ov21_021DC9BC.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int heapID);
+#include "heap.h"
+
+void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021DCA14(UnkStruct_ov21_021E68F4 *param0);
 int ov21_021DCA28(const UnkStruct_ov21_021E68F4 *param0);
 void ov21_021DCA30(UnkStruct_ov21_021E68F4 *param0, int param1);

diff --git a/include/overlay021/ov21_021DDD2C.h b/include/overlay021/ov21_021DDD2C.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021DDD8C(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021DDD2C_H
diff --git a/include/overlay021/ov21_021DE668.h b/include/overlay021/ov21_021DE668.h
@@ -7,12 +7,13 @@
 #include "overlay021/struct_ov21_021E68F4.h"
 
 #include "bg_window.h"
+#include "heap.h"
 
-void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021DE6C0(UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1);
 BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1);
-void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param4);
+void ov21_021DEB8C(Window *param0, int param1, enum HeapId heapID, int param3, u32 param4);
 int ov21_021DF180(int param0);
 Window *ov21_021DF30C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2);
 

diff --git a/include/overlay021/ov21_021DF734.h b/include/overlay021/ov21_021DF734.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021DF78C(UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021DF7A0(UnkStruct_ov21_021E68F4 *param0, int param1);
 

diff --git a/include/overlay021/ov21_021E0C68.h b/include/overlay021/ov21_021E0C68.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E0CC0(UnkStruct_ov21_021E68F4 *param0);
 void ov21_021E0CD4(UnkStruct_ov21_021E68F4 *param0, int param1, int param2);
 void ov21_021E0CDC(UnkStruct_ov21_021E68F4 *param0, int param1);

diff --git a/include/overlay021/ov21_021E1924.h b/include/overlay021/ov21_021E1924.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E1984(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021E1924_H
diff --git a/include/overlay021/ov21_021E29DC.h b/include/overlay021/ov21_021E29DC.h
@@ -4,10 +4,12 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E2A3C(UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021E2A54(const UnkStruct_ov21_021E68F4 *param0);
-void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E338C(UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021E33A4(const UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021E33AC(const UnkStruct_ov21_021E68F4 *param0);

diff --git a/include/overlay021/ov21_021E3FFC.h b/include/overlay021/ov21_021E3FFC.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E4054(UnkStruct_ov21_021E68F4 *param0);
 void ov21_021E4068(UnkStruct_ov21_021E68F4 *param0, int param1, int param2);
 void ov21_021E4070(UnkStruct_ov21_021E68F4 *param0, int param1);

diff --git a/include/overlay021/ov21_021E4CA4.h b/include/overlay021/ov21_021E4CA4.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E4D04(UnkStruct_ov21_021E68F4 *param0);
 int ov21_021E4D1C(const UnkStruct_ov21_021E68F4 *param0);
 

diff --git a/include/overlay021/ov21_021E68F4.h b/include/overlay021/ov21_021E68F4.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E6954(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021E68F4_H
diff --git a/include/overlay021/ov21_021E737C.h b/include/overlay021/ov21_021E737C.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E73D4(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021E737C_H
diff --git a/include/overlay021/ov21_021E8484.h b/include/overlay021/ov21_021E8484.h
@@ -4,7 +4,9 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E84E4(UnkStruct_ov21_021E68F4 *param0);
 
 #endif // POKEPLATINUM_OV21_021E8484_H
diff --git a/include/overlay021/pokedex_enc_data.h b/include/overlay021/pokedex_enc_data.h
@@ -4,6 +4,7 @@
 #include "constants/species.h"
 
 #include "cell_actor.h"
+#include "heap.h"
 
 typedef struct EncounterLocations {
     int *locations;
@@ -49,7 +50,7 @@ enum PokedexEncFileCatgegory {
  * @param encounterCategory
  * @param heapID
  */
-void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, int heapID);
+void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapId heapID);
 
 /**
  * @brief Frees encounter data from the heap
@@ -68,7 +69,7 @@ void PokedexEncData_FreeEncounterLocations(EncounterLocations *encounterLocation
  * @param numDungeons
  * @return Array of coordinates for each dungeon
  */
-DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(int heapID, int *numDungeons);
+DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int *numDungeons);
 
 /**
  * @brief Reads field coordinates data from zukan_enc_platinum.narc
@@ -80,7 +81,7 @@ DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(int heapID, int *numDun
  * @param numFields
  * @return Array of coordinates for each field
  */
-FieldCoordinates *PokedexEncData_GetFieldCoordinates(int heapID, int *numFields);
+FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapId heapID, int *numFields);
 
 /**
  * @brief Updates fieldMap with the coordinates occupied by the field

diff --git a/include/overlay021/ov21_021E6014.h → include/overlay021/pokedex_height_check.h b/include/overlay021/ov21_021E6014.h → include/overlay021/pokedex_height_check.h
@@ -1,10 +1,12 @@
-#ifndef POKEPLATINUM_OV21_021E6014_H
-#define POKEPLATINUM_OV21_021E6014_H
+#ifndef POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H
+#define POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H
 
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+#include "heap.h"
+
+void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID);
 void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0);
 
-#endif // POKEPLATINUM_OV21_021E6014_H
+#endif // POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H