Decompile setupInit

This commit is contained in:
Ryan Dwyer
2021-01-04 11:10:39 +10:00
parent ead0e52765
commit 75094f8efe
9 changed files with 716 additions and 550 deletions
+1 -1
View File
@@ -362,7 +362,7 @@ void coreLoadStage(s32 stagenum)
func0f00eb64(stagenum);
mpPrepareScenario();
gvarsInitProps();
func0f00c490();
setupInit();
func0f00b510();
stageChooseActiveHeads(stagenum);
setupParseObjects(stagenum);
+654 -518
View File
File diff suppressed because it is too large Load Diff
+8 -10
View File
@@ -103,12 +103,10 @@ struct audiohandle *g_AlarmAudioHandle = NULL;
f32 g_AlarmSpeakerWeight = 64;
f32 g_AlarmSpeakerDirection = 1;
f32 var800698e4 = 0;
u32 var800698e8 = 0x00000000;
u32 var800698ec = 0x00000000;
u32 var800698f0 = 0x00000000;
u32 var800698f4 = 0x00000000;
s32 var800698e8 = 0;
f32 var800698ec[3] = {0};
u32 var800698f8 = 0x00000000;
u32 var800698fc = 0x00000000;
f32 var800698fc = 0;
struct audiohandle *var80069900 = NULL;
u32 g_CountdownTimerVisible = 1; // 80069904
bool g_CountdownTimerRunning = false; // 80069908
@@ -122,7 +120,7 @@ struct safeitemobj *g_SafeItems = NULL;
struct linksceneryobj *g_LinkedScenery = NULL;
struct blockedpathobj *g_BlockedPaths = NULL;
u32 var80069930 = 0x00000000;
u32 var80069934 = 0x00000000;
s32 var80069934 = 0;
u32 var80069938 = 0x00000000;
u32 var8006993c = 0x00000000;
u32 var80069940 = 0x00000000;
@@ -136,8 +134,8 @@ f32 g_AmmoMultiplier = 1;
struct padeffectobj *var80069960 = NULL;
s32 var80069964 = -1;
struct autogunobj *g_ThrownLaptops = NULL;
u32 var8006996c = 0x00000000;
u32 var80069970 = 0x00000000;
struct var8006996c *var8006996c = NULL;
s32 g_MaxThrownLaptops = 0;
u32 var80069974 = 0x00000000;
u32 var80069978 = 0x00000000;
u32 var8006997c = 0x00000000;
@@ -41627,8 +41625,8 @@ glabel var7f1aae98
/* f08b2c0: afa20094 */ sw $v0,0x94($sp)
.L0f08b2c4:
/* f08b2c4: 044000df */ bltz $v0,.L0f08b644
/* f08b2c8: 3c188007 */ lui $t8,%hi(var80069970)
/* f08b2cc: 8f189970 */ lw $t8,%lo(var80069970)($t8)
/* f08b2c8: 3c188007 */ lui $t8,%hi(g_MaxThrownLaptops)
/* f08b2cc: 8f189970 */ lw $t8,%lo(g_MaxThrownLaptops)($t8)
/* f08b2d0: 0058082a */ slt $at,$v0,$t8
/* f08b2d4: 502000dc */ beqzl $at,.L0f08b648
/* f08b2d8: 8fbf0024 */ lw $ra,0x24($sp)
+8 -8
View File
@@ -14641,16 +14641,16 @@ u32 var8009cdbc = 0;
struct weaponobj *g_ProxyMines[30] = {NULL};
u32 var8009ce38 = 0;
u32 var8009ce3c = 0;
u32 var8009ce40 = 0;
u32 var8009ce44 = 0;
u32 var8009ce48 = 0;
u32 var8009ce4c = 0;
s32 var8009ce40 = 0;
s32 var8009ce44 = 0;
s32 var8009ce48 = 0;
s32 var8009ce4c = 0;
s32 g_NumProjectiles = 0;
s32 g_NumMonitorThings = 0;
u32 var8009ce58 = 0;
u32 var8009ce5c = 0;
u32 var8009ce60 = 0;
u32 var8009ce64 = 0;
struct var8009ce58 *var8009ce58 = NULL;
struct defaultobj *var8009ce5c = NULL;
struct var8009ce60 *var8009ce60 = NULL;
struct defaultobj *var8009ce64 = NULL;
struct projectile *g_Projectiles = NULL;
struct monitorthing *g_MonitorThings = NULL;
u32 var8009ce70 = 0;
+4 -4
View File
@@ -30,10 +30,10 @@ extern struct audiohandle *g_AlarmAudioHandle;
extern f32 g_AlarmSpeakerWeight;
extern f32 g_AlarmSpeakerDirection;
extern f32 var800698e4;
extern u32 var800698e8;
extern u32 var800698ec;
extern s32 var800698e8;
extern f32 var800698ec[3];
extern u32 var800698f8;
extern u32 var800698fc;
extern f32 var800698fc;
extern struct audiohandle *var80069900;
extern u32 var80069910;
extern u32 var80069918;
@@ -47,7 +47,7 @@ extern f32 g_AmmoMultiplier;
extern struct padeffectobj *var80069960;
extern s32 var80069964;
extern struct autogunobj *g_ThrownLaptops;
extern u32 var80069970;
extern s32 g_MaxThrownLaptops;
extern u32 var80069974;
extern u32 var80069978;
extern u32 var8006997c;
+1 -1
View File
@@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
void func0f00c490(void);
void setupInit(void);
void addLiftDoor(struct linkliftdoorobj *link);
void addPadlockedDoor(struct padlockeddoorobj *link);
void addSafeItem(struct safeitemobj *link);
+6
View File
@@ -3,11 +3,17 @@
#include <ultra64.h>
#include "types.h"
extern u32 var800698f0;
extern u32 var800698f4;
extern u32 var80069914;
extern u32 var80069930;
extern s32 var80069934;
extern f32 var80069948;
extern f32 var8006994c;
extern f32 var80069950;
extern f32 var80069954;
extern f32 var80069958;
extern struct var8006996c *var8006996c;
void alarmActivate(void);
void alarmDeactivate(void);
+8 -8
View File
@@ -535,16 +535,16 @@ extern u32 var8009cdac;
extern u32 var8009cdb0;
extern struct weaponobj *g_ProxyMines[30];
extern u32 var8009ce38;
extern u32 var8009ce40;
extern u32 var8009ce44;
extern u32 var8009ce48;
extern u32 var8009ce4c;
extern s32 var8009ce40;
extern s32 var8009ce44;
extern s32 var8009ce48;
extern s32 var8009ce4c;
extern s32 g_NumProjectiles;
extern s32 g_NumMonitorThings;
extern u32 var8009ce58;
extern u32 var8009ce5c;
extern u32 var8009ce60;
extern u32 var8009ce64;
extern struct var8009ce58 *var8009ce58;
extern struct defaultobj *var8009ce5c;
extern struct var8009ce60 *var8009ce60;
extern struct defaultobj *var8009ce64;
extern struct projectile *g_Projectiles;
extern struct monitorthing *g_MonitorThings;
extern u32 var8009ce78;
+26
View File
@@ -6753,4 +6753,30 @@ struct var8009cda4 {
s16 unk00[8];
};
struct var8009ce58 {
struct defaultobj base;
/*0x5c*/ u32 unk5c;
/*0x60*/ u32 unk60;
/*0x64*/ u32 unk64;
};
struct var8009ce60 {
struct defaultobj base;
/*0x5c*/ u32 unk5c;
};
struct var8006996c {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
};
#endif