You've already forked HackerSM64
mirror of
https://github.com/HackerN64/HackerSM64.git
synced 2026-01-21 10:35:32 -08:00
fixed up any reference to 8 bit models with the new ModelID type
This commit is contained in:
committed by
farisawan-2000
parent
a4a6a85312
commit
03a6eeeb37
@@ -17,7 +17,7 @@ struct SpecialPreset
|
||||
/*00*/ u8 preset_id;
|
||||
/*01*/ u8 type; // Determines whether object is 8, 10, 12 or 14 bytes long.
|
||||
/*02*/ u8 defParam; // Default parameter, only used when type is SPTYPE_DEF_PARAM_AND_YROT
|
||||
/*03*/ u8 model;
|
||||
/*03*/ ModelID model;
|
||||
/*04*/ const BehaviorScript *behavior;
|
||||
};
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ struct Struct8032F34C {
|
||||
s16 numBridgeSections;
|
||||
s16 bridgeRelativeStartingXorZ;
|
||||
s16 platformWidth;
|
||||
s16 model;
|
||||
ModelID model;
|
||||
const void *segAddr;
|
||||
};
|
||||
|
||||
@@ -73,7 +73,7 @@ struct Struct802C0DF0 {
|
||||
u8 unk0;
|
||||
u8 unk1;
|
||||
u8 unk2;
|
||||
u8 model;
|
||||
ModelID model;
|
||||
const BehaviorScript *behavior;
|
||||
};
|
||||
|
||||
@@ -85,7 +85,7 @@ struct Struct8032F754 {
|
||||
|
||||
struct OpenableGrill {
|
||||
s16 halfWidth;
|
||||
s16 modelID;
|
||||
ModelID modelID;
|
||||
const Collision *collision;
|
||||
};
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ static void spawn_macro_coin_unknown(const BehaviorScript *behavior, s16 a1[]) {
|
||||
struct LoadedPreset {
|
||||
/*0x00*/ const BehaviorScript *behavior;
|
||||
/*0x04*/ s16 param; // huh? why does the below function swap these.. just use the struct..
|
||||
/*0x06*/ s16 model;
|
||||
/*0x06*/ ModelID model;
|
||||
};
|
||||
|
||||
#define MACRO_OBJ_Y_ROT 0
|
||||
@@ -245,7 +245,7 @@ void spawn_special_objects(s16 areaIndex, s16 **specialObjList) {
|
||||
s16 y;
|
||||
s16 z;
|
||||
s16 extraParams[4];
|
||||
u8 model;
|
||||
ModelID model;
|
||||
u8 type;
|
||||
u8 presetID;
|
||||
u8 defaultParam;
|
||||
|
||||
@@ -55,7 +55,7 @@ struct SpawnParticlesInfo
|
||||
{
|
||||
/*0x00*/ s8 behParam;
|
||||
/*0x01*/ s8 count;
|
||||
/*0x02*/ u8 model;
|
||||
/*0x02*/ ModelID model;
|
||||
/*0x03*/ s8 offsetY;
|
||||
/*0x04*/ s8 forwardVelBase;
|
||||
/*0x05*/ s8 forwardVelRange;
|
||||
|
||||
@@ -188,7 +188,7 @@ s8 sObjectListUpdateOrder[] = { OBJ_LIST_SPAWNER,
|
||||
struct ParticleProperties {
|
||||
u32 particleFlag;
|
||||
u32 activeParticleFlag;
|
||||
u8 model;
|
||||
ModelID model;
|
||||
const BehaviorScript *behavior;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user