Decompile roomGetNeighbours

src/include/game/room.h

@@ -89,11 +89,11 @@ u32 func0f16397c(void);
 void func0f163e34(void);
 Gfx *func0f164150(Gfx *gdl);
 u32 func0f164534(void);
-s32 roomGetNeighbours(s32 room, s16 *rooms, s32 arg2);
-bool func0f1646b8(s32 roomnum, s32 arg1);
+s32 roomGetNeighbours(s32 room, s16 *rooms, s32 len);
+bool roomsAreNeighbours(s32 roomnum1, s32 roomnum2);
 u32 func0f164748(void);
 u32 func0f1648cc(void);
-void portalSwapProps(u32 portal);
+void portalSwapRooms(u32 portal);
 u32 func0f164ab8(void);
 u32 func0f164c64(void);
 void portalSetEnabled(s32 portal, bool enable);

src/include/gvars/gvars.h

@@ -715,7 +715,7 @@ extern struct var800a4ccc *var800a4ccc; // indexed by portalnum
 extern u8 *var800a4cd0;
 extern struct portalcmd *g_PortalCommands;
 extern u8 *g_LightsFileData;
-extern s16 *var800a4ce0; // portal numbers
+extern s16 *g_RoomPortals; // portal numbers for each room, ordered by room
 extern s16 var800a4ce4[2];
 extern struct var800a4ce8 *var800a4ce8;
 extern struct portalthing *g_PortalThings;

src/include/types.h

@@ -3534,13 +3534,13 @@ struct room {
 	/*0x00*/ u16 flags;
 	/*0x02*/ s16 unk02;
 	/*0x04*/ u8 portalrecursioncount;
-	/*0x05*/ s8 unk05;
+	/*0x05*/ s8 numportals;
 	/*0x06*/ u8 unk06;
 	/*0x07*/ u8 unk07;
 	/*0x08*/ s8 numlights;
 	/*0x0a*/ u16 lightindex; // index of start of this room's lights in data file
 	/*0x0c*/ u16 unk0c;
-	/*0x0e*/ s16 unk0e;
+	/*0x0e*/ s16 roomportallistoffset;
 	/*0x10*/ u32 unk10;
 	/*0x14*/ struct room14 *unk14;
 	/*0x18*/ f32 bbmin[3];
@@ -4662,8 +4662,8 @@ struct scenariodata {
 
 struct portal {
 	u16 unk00;
-	s16 unk02;
-	s16 unk04;
+	s16 roomnum1;
+	s16 roomnum2;
 	u8 flags;
 };