Discover g_Vars.stagenum and stageGetIndex

src/include/commands.h

@@ -471,9 +471,13 @@
 	mkshort(pad), \
 	label,
 
-// type 0 = if <chr> is in <room>
-// type 1 = if <chr> is in same room that self is searching
-// type 2 = if <chr>'s camspy is within 150 units of <pad>
+/**
+ * type 0 = if <chr> is in <room>
+ * type 1 = if <chr> is in same room that self is searching
+ * type 2 = if <chr>'s camspy is within 150 units of <pad>
+ *
+ * Type 2 is hard coded to only work in G5 Building.
+ */
 #define if_chr_in_room(chr, type, room_or_pad, label) \
 	mkshort(0x005b), \
 	chr, \

src/include/constants.h

@@ -760,6 +760,67 @@
 #define STAGE_DUEL          0x4f
 #define STAGE_TEST_LAM      0x50
 
+#define NUM_STAGES 0x5a
+
+#define STAGEINDEX_MAIANSOS      0x00
+#define STAGEINDEX_TEST_SILO     0x01
+#define STAGEINDEX_WAR           0x02
+#define STAGEINDEX_MP_RAVINE     0x03
+#define STAGEINDEX_TEST_ARCH     0x04
+#define STAGEINDEX_ESCAPE        0x05
+#define STAGEINDEX_TEST_DEST     0x06
+#define STAGEINDEX_RETAKING      0x07
+#define STAGEINDEX_CRASHSITE     0x08
+#define STAGEINDEX_CHICAGO       0x09
+#define STAGEINDEX_G5BUILDING    0x0a
+#define STAGEINDEX_MP_COMPLEX    0x0b
+#define STAGEINDEX_MP_G5BUILDING 0x0c
+#define STAGEINDEX_PELAGIC       0x0d
+#define STAGEINDEX_EXTRACTION    0x0e
+#define STAGEINDEX_TEST_RUN      0x0f
+#define STAGEINDEX_MP_TEMPLE     0x11
+#define STAGEINDEX_CITRAINING    0x12
+#define STAGEINDEX_AIRBASE       0x13
+#define STAGEINDEX_MP_PIPES      0x15
+#define STAGEINDEX_SKEDARRUINS   0x16
+#define STAGEINDEX_VILLA         0x18
+#define STAGEINDEX_DEFENSE       0x19
+#define STAGEINDEX_TEST_ASH      0x1a
+#define STAGEINDEX_INFILTRATION  0x1b
+#define STAGEINDEX_DEFECTION     0x1c
+#define STAGEINDEX_AIRFORCEONE   0x1d
+#define STAGEINDEX_MP_SKEDAR     0x1e
+#define STAGEINDEX_INVESTIGATION 0x1f
+#define STAGEINDEX_ATTACKSHIP    0x20
+#define STAGEINDEX_RESCUE        0x21
+#define STAGEINDEX_TEST_LEN      0x22
+#define STAGEINDEX_MBR           0x23
+#define STAGEINDEX_DEEPSEA       0x24
+#define STAGEINDEX_TEST_UFF      0x25
+#define STAGEINDEX_TEST_OLD      0x26
+#define STAGEINDEX_DUEL          0x27
+#define STAGEINDEX_TEST_LAM      0x28
+#define STAGEINDEX_MP_BASE       0x29
+#define STAGEINDEX_TEST_MP2      0x2a
+#define STAGEINDEX_MP_AREA52     0x2b
+#define STAGEINDEX_MP_WAREHOUSE  0x2c
+#define STAGEINDEX_MP_CARPARK    0x2d
+#define STAGEINDEX_TEST_MP6      0x2e
+#define STAGEINDEX_TEST_MP7      0x2f
+#define STAGEINDEX_TEST_MP8      0x30
+#define STAGEINDEX_MP_RUINS      0x31
+#define STAGEINDEX_MP_SEWERS     0x32
+#define STAGEINDEX_MP_FELICITY   0x33
+#define STAGEINDEX_MP_FORTRESS   0x34
+#define STAGEINDEX_MP_VILLA      0x35
+#define STAGEINDEX_TEST_MP14     0x36
+#define STAGEINDEX_MP_GRID       0x37
+#define STAGEINDEX_TEST_MP16     0x38
+#define STAGEINDEX_TEST_MP17     0x39
+#define STAGEINDEX_TEST_MP18     0x3a
+#define STAGEINDEX_TEST_MP19     0x3b
+#define STAGEINDEX_TEST_MP20     0x3c
+
 #define TARGET_PAD 0x2328
 
 #define WEAPON_NONE              0x00

src/include/game/game_157db0.h

@@ -103,6 +103,6 @@ u32 func0f165004(void);
 u32 func0f1650d0(void);
 u32 func0f165360(void);
 u32 func0f1655c0(void);
-u32 func0f165614(void);
+s32 stageGetIndex(s32 stagenum);
 
 #endif

src/include/gvars/gvars.h

@@ -185,7 +185,7 @@ struct g_vars {
 	/*0004a8*/ u32 unk0004a8;
 	/*0004ac*/ u32 unk0004ac;
 	/*0004b0*/ u32 unk0004b0;
-	/*0004b4*/ s32 unk0004b4;
+	/*0004b4*/ s32 stagenum;
 	/*0004b8*/ u32 unk0004b8;
 	/*0004bc*/ u32 unk0004bc;
 	/*0004c0*/ u32 unk0004c0;

src/include/setup/setup_000000.h

@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-extern s32 levelnum;
+extern s32 g_StageNum;
 extern u64 rand_seed;
 
 extern struct chrdata *g_Chrs; // pointer to first element of chrs array

src/include/setup/setup_020df0.h

@@ -199,7 +199,7 @@ extern u32 var8007fca8;
 extern u32 var8007fcac;
 extern u32 var8007fcb0;
 extern u32 var8007fcb4;
-extern struct stagetableentry stagetable[];
+extern struct stagetableentry g_Stages[61];
 extern u32 var80081018;
 extern u32 var80081058;
 extern struct smallsky smallskies[];

src/include/types.h

@@ -2626,7 +2626,7 @@ struct bodytableentry {
 };
 
 struct stagetableentry {
-	u16 id;
+	s16 id;
 	u8 light_type;
 	u8 light_alpha;
 	u8 light_width;