# GLOBAL_ASM remaining: 300 (#405)

* Declare free_texture and free_sprite as NON_MATCHING now

* Match func_8007B380 and split func_800149C0 from func_80014814

* Match func_800149C0

* Move weather asm to its own folder

* Rename the unknown_05CEF0 folder to vehicle_tricky

* 2 matches, remove matched asm files, and fix other things

* WIP func_800BEFC4

* WIP update on func_800BEFC4

* Match func_800BEEB4

* Maybe better func_800BEEB4

* Update Score

* Fix NON_EQUIVALENT build.
This commit is contained in:
Ryan Myers
2023-09-18 14:46:32 -04:00
committed by GitHub
parent 14970cac4b
commit 7202d9efa5
35 changed files with 425 additions and 1527 deletions
+29 -1
View File
@@ -1463,6 +1463,32 @@ typedef struct Object_WizpigRocket {
f32 unk74;
} Object_WizpigRocket;
typedef struct Object_8001E89C_64_C {
/* 0x00 */ u8 pad0[0xC];
/* 0x0C */ f32 unkC;
/* 0x10 */ f32 unk10;
/* 0x14 */ f32 unk14;
} Object_8001E89C_64_C;
typedef struct Object_8001E89C_64 {
/* 0x00 */ f32 unk0;
/* 0x04 */ f32 unk4;
/* 0x08 */ f32 unk8;
/* 0x0C */ Object_8001E89C_64_C *unkC;
} Object_8001E89C_64;
typedef struct Object_800BEEB4_64 {
/* 0x00 */ s16 unk0;
/* 0x02 */ u8 unk2;
/* 0x04 */ u8 unk3;
/* 0x04 */ u16 unk4;
/* 0x06 */ u16 unk6;
/* 0x08 */ u16 unk8;
/* 0x0A */ u16 unkA;
/* 0x0C */ u16 unkC;
/* 0x0E */ s8 unkE[2];
} Object_800BEEB4_64;
typedef struct Object_64 {
union {
Object_Laser laser;
@@ -1508,6 +1534,8 @@ typedef struct Object_64 {
Object_LaserGun lasergun;
Object_AnimatedObject animatedObject;
Object_WizpigRocket wizpigRocket;
Object_8001E89C_64 obj8001E89C_64;
Object_800BEEB4_64 obj800BEEB4_64;
};
} Object_64;
@@ -1655,7 +1683,7 @@ typedef struct SegmentPropertiesObject {
/* 0x0030 */ f32 distanceToCamera;
/* 0x0034 */ s16 cameraSegmentID;
/* 0x0036 */ s16 unk36;
/* 0x0038 */ u8 unk38;
/* 0x0038 */ s8 unk38;
/* 0x0039 */ u8 opacity;
/* 0x003A */ s8 numModelIDs;
/* 0x003B */ s8 animationID;