Decompile frEndSession

src/include/game/game_0601b0.h

@@ -40,7 +40,7 @@ u32 func0f064ce8(void);
 u32 func0f0654e8(void);
 u32 func0f06554c(void);
 void roomsCopy(s16 *srcrooms, s16 *dstrooms);
-void func0f0657d8(s16 *newrooms, u32 arg1, u32 arg2);
+void func0f0657d8(s16 *newrooms, s16 *rooms, u32 arg2);
 bool arrayIntersects(s16 *a, s16 *b);
 u32 func0f0658e8(void);
 u32 func0f06593c(void);
@@ -48,9 +48,9 @@ void func0f0659e4(struct prop *prop, s16 room);
 void func0f065ae0(struct prop *prop, s16 room);
 void func0f065c44(struct prop *prop);
 void func0f065cb0(struct prop *prop);
-void func0f065d1c(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, u32 arg4, u32 arg5);
+void func0f065d1c(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, u32 arg5);
 u32 func0f065dd8(void);
-void func0f065dfc(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, u32 arg4, u32 arg5);
+void func0f065dfc(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, u32 arg5);
 void func0f065e74(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms);
 void func0f065e98(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2);
 void roomGetProps(s16 *room, s16 *propnums, u32 size);

src/include/game/game_157db0.h

@@ -89,7 +89,7 @@ u32 func0f16397c(void);
 void func0f163e34(void);
 u32 func0f164150(void);
 u32 func0f164534(void);
-u32 func0f1645a8(void);
+void func0f1645a8(s16 room, s16 *rooms, u32 arg2);
 u32 func0f1646b8(void);
 u32 func0f164748(void);
 u32 func0f1648cc(void);

src/include/game/game_19c990.h

@@ -23,7 +23,7 @@ void frSetSlot(s32 slot);
 u32 frGetWeaponBySlot(s32 slot);
 s32 frGetNumWeaponsAvailable(void);
 u32 func0f19d338(void);
-u32 func0f19d414(void);
+void func0f19d414(void);
 void func0f19d4ec(void);
 void *func0f19d560(u32 len);
 void frSetDifficulty(s32 difficulty);
@@ -46,7 +46,7 @@ u32 func0f19e7a8(void);
 u32 func0f19e900(s32 weapon);
 void func0f19e9c0(s32 weapon);
 char *frGetWeaponDescription(void);
-void func0f19ecdc(s32 arg0);
+void frEndSession(bool hidetargets);
 bool frWasTooInaccurate(void);
 void frSetFailReason(s32 failreason);
 void func0f19f18c(void);

src/include/game/game_1a3340.h

@@ -46,7 +46,7 @@ bool menudialog001a6aa4(u32 operation, struct menudialog *dialog, struct menu *m
 bool menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, struct menu *menu);
 s32 menudialog001a737c(u32, u32, u32 *);
 s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, s32 *value);
-s32 menuhandler001a3448(u32 operation, struct menuitem *item, s32 *value);
+s32 frAbortMenuHandler(u32 operation, struct menuitem *item, s32 *value);
 s32 menuhandler001a348c(u32, u32, u32 *);
 s32 menuhandler001a44c0(u32, u32, u32 *);
 s32 menuhandlerFrFailedContinue(u32 operation, struct menuitem *item, s32 *value);

src/include/game/propobj.h

@@ -94,7 +94,7 @@ u32 func0f06ab60(void);
 void func0f06ac40(struct defaultobj *obj);
 void func0f06ac90(struct prop *prop);
 void setupParseObject(void *ptr, bool arg1, bool arg2);
-void setupParseObjectWithArg2False(void *ptr, bool arg1);
+void setupParseObjectWithArg2False(void *ptr, s32 arg1);
 u32 func0f06b36c(void);
 bool func0f06b39c(struct coord *arg0, struct coord *arg1, struct coord *arg2, f32 arg3);
 u32 func0f06b488(void);

src/include/gvars/gvars.h

@@ -683,8 +683,8 @@ extern u32 var800a33a8;
 extern u32 var800a33e8;
 extern u32 var800a3410;
 extern u32 var800a3420;
-extern u32 var800a3430;
-extern u32 var800a3434;
+extern struct explosion *g_Explosions;
+extern s32 g_NumExplosions;
 extern struct smoke *g_Smokes;
 extern s32 g_NumSmokes;
 extern u32 var800a3448;

src/include/types.h

@@ -1207,7 +1207,7 @@ struct weaponobj { // objtype 0x08
 	/*0x5c*/ u8 weaponnum;
 	/*0x5d*/ s8 unk5d;
 	/*0x5e*/ s8 unk5e;
-	/*0x5f*/ u8 dragonthrown;
+	/*0x5f*/ u8 thrown; // Dragon and Laptop Gun
 	/*0x60*/ s8 unk60;
 	/*0x61*/ s8 dualweaponnum;
 
@@ -4839,6 +4839,15 @@ struct explosiontype {
 	/*0x28*/ f32 damage;
 };
 
+struct explosion08 {
+	u32 unk00;
+	u32 unk04;
+	u32 unk08;
+	u32 unk0c;
+	u32 unk10;
+	u16 unk14;
+};
+
 struct explosionbb { // billboards?
 	struct coord unk00;
 	struct coord unk0c;
@@ -4847,8 +4856,11 @@ struct explosionbb { // billboards?
 };
 
 struct explosion {
-	u8 unk[0x3c8];
-	/*0x3c8*/ s32 frame60;
+	u32 unk00;
+	u32 unk04;
+	struct explosion08 unk08[40];
+	/*0x3c8*/ s16 age;
+	/*0x3ca*/ s16 frame60;
 	/*0x3cc*/ s8 type;
 	/*0x3cd*/ s8 makescorch;
 	/*0x3ce*/ s8 owner;
@@ -4859,7 +4871,8 @@ struct explosion {
 	/*0x3dc*/ u32 unk3dc;
 	/*0x3e0*/ u32 unk3e0;
 	/*0x3e4*/ u32 unk3e4;
-	/*0x3e8*/ struct explosionbb bbs[1]; // length unknown
+	/*0x3e8*/ struct explosionbb bbs[5]; // may be smaller
+	/*0x474*/ u32 unk474;
 };
 
 struct smoketype {