diff --git a/src/yaze.cc b/src/yaze.cc
index cc1edf86..92340b94 100644
--- a/src/yaze.cc
+++ b/src/yaze.cc
@@ -233,12 +233,15 @@ zelda3_overworld* yaze_load_overworld(const zelda3_rom* rom) {
   return overworld;
 }
 
-zelda3_dungeon_room* yaze_load_all_rooms(const zelda3_rom* rom) {
+zelda3_dungeon_room* yaze_load_all_rooms(const zelda3_rom* rom, int* room_count) {
   if (rom->impl == nullptr) {
     return nullptr;
   }
   yaze::Rom* internal_rom = static_cast<yaze::Rom*>(rom->impl);
   zelda3_dungeon_room* rooms = new zelda3_dungeon_room[256];
+  if (room_count != nullptr) {
+    *room_count = 256;
+  }
   return rooms;
 }