mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-31 23:58:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile objRemove2

Browse Source
This commit is contained in:
Ryan Dwyer
2021-05-29 22:38:03 +10:00
parent cbea40c6a7
commit d2778727ad
17 changed files with 251 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+2 -2
View File
@@ -2968,7 +2968,7 @@
#define OBJHFLAG_ACTIVATED_BY_COOP 0x00040000
#define OBJHFLAG_HASOWNER 0x00080000
#define OBJHFLAG_00100000 0x00100000
#define OBJHFLAG_00200000 0x00200000 // Occupied chair?
#define OBJHFLAG_OCCUPIEDCHAIR 0x00200000
#define OBJHFLAG_00400000 0x00400000
#define OBJHFLAG_00800000 0x00800000
#define OBJHFLAG_01000000 0x01000000
@@ -3933,7 +3933,7 @@
#define WEAPON_GRENADEROUND 0x55
#define WEAPON_BOLT 0x56
#define WEAPON_BRIEFCASE2 0x57
#define WEAPON_ROCKET2 0x58
#define WEAPON_SKROCKET 0x58
#define WEAPON_59 0x59
#define WEAPON_5A 0x5a
#define WEAPON_MPSHIELD 0x5b
src/include/game/game_015010.h
+1 -1
View File
@@ -4,6 +4,6 @@
#include "data.h"
#include "types.h"
void func0f015010(void);
void objsReset(void);
#endif
src/include/game/propobj.h
+2 -2
View File
@@ -106,8 +106,8 @@ void func0f06a730(struct defaultobj *obj, struct pad *newpad, Mtxf *matrix, s16
u32 func0f06ab60(void);
void objEndFlight(struct defaultobj *obj);
void func0f06ac90(struct prop *prop);
void func0f06ad2c(void *ptr, bool arg1, bool arg2);
void func0f06b34c(void *obj, bool arg1);
void objRemove2(struct defaultobj *obj, bool freeprop, bool onlyunref);
void objRemove(struct defaultobj *obj, bool freeprop);
u32 func0f06b36c(void);
bool func0f06b39c(struct coord *arg0, struct coord *arg1, struct coord *arg2, f32 arg3);
u32 func0f06b488(void);
src/include/types.h
+2 -2
View File
@@ -801,7 +801,7 @@ struct aibot {
/*0x008*/ s16 attackingplayernum;
/*0x00a*/ s16 followingplayernum;
/*0x00c*/ s16 dangerouspropnum; // index into g_DangerousProps
/*0x010*/ struct prop *prop;
/*0x010*/ struct prop *fetchprop;
/*0x014*/ struct invitem *items;
/*0x018*/ s8 maxitems;
/*0x01c*/ s32 *ammoheld;
@@ -814,7 +814,7 @@ struct aibot {
/*0x03c*/ u16 unk03c;
/*0x03e*/ s16 unk03e;
/*0x040*/ f32 unk040;
/*0x044*/ struct prop *unk044; // obj
/*0x044*/ struct prop *skrocket;
/*0x048*/ s16 unk048;
/*0x04a*/ s16 unk04a;
/*0x04c*/ u8 unk04c_00 : 1;