Identify drug table thing in .data segment
This commit is contained in:
Ryan Dwyer
parent
d5efc7d0f0
commit
3ee00a7654
|
|
@ -4605,12 +4605,12 @@ glabel func0f0319a8
|
|||
/* f031ed8: a20f0362 */ sb $t7,0x362($s0)
|
||||
.L0f031edc:
|
||||
/* f031edc: 8fa20040 */ lw $v0,0x40($sp)
|
||||
/* f031ee0: 3c188006 */ lui $t8,%hi(var800652c8)
|
||||
/* f031ee4: 271852c8 */ addiu $t8,$t8,%lo(var800652c8)
|
||||
/* f031ee0: 3c188006 */ lui $t8,0x8006
|
||||
/* f031ee4: 271852c8 */ addiu $t8,$t8,0x52c8
|
||||
/* f031ee8: 10580005 */ beq $v0,$t8,.L0f031f00
|
||||
/* f031eec: a2000008 */ sb $zero,0x8($s0)
|
||||
/* f031ef0: 3c0e8006 */ lui $t6,%hi(var800652c0)
|
||||
/* f031ef4: 25ce52c0 */ addiu $t6,$t6,%lo(var800652c0)
|
||||
/* f031ef0: 3c0e8006 */ lui $t6,0x8006
|
||||
/* f031ef4: 25ce52c0 */ addiu $t6,$t6,0x52c0
|
||||
/* f031ef8: 144e0035 */ bne $v0,$t6,.L0f031fd0
|
||||
/* f031efc: 3c188006 */ lui $t8,%hi(var800652b8)
|
||||
.L0f031f00:
|
||||
|
|
@ -4652,8 +4652,8 @@ glabel func0f0319a8
|
|||
/* f031f88: e60402f8 */ swc1 $f4,0x2f8($s0)
|
||||
/* f031f8c: 8fb90040 */ lw $t9,0x40($sp)
|
||||
.L0f031f90:
|
||||
/* f031f90: 3c0d8006 */ lui $t5,%hi(var800652c0)
|
||||
/* f031f94: 25ad52c0 */ addiu $t5,$t5,%lo(var800652c0)
|
||||
/* f031f90: 3c0d8006 */ lui $t5,0x8006
|
||||
/* f031f94: 25ad52c0 */ addiu $t5,$t5,0x52c0
|
||||
/* f031f98: 172d02c5 */ bne $t9,$t5,.L0f032ab0
|
||||
/* f031f9c: 3c018007 */ lui $at,0x8007
|
||||
/* f031fa0: ac20807c */ sw $zero,-0x7f84($at)
|
||||
|
|
@ -4671,7 +4671,7 @@ glabel func0f0319a8
|
|||
.L0f031fd0:
|
||||
/* f031fd0: 271852b8 */ addiu $t8,$t8,%lo(var800652b8)
|
||||
/* f031fd4: 145801c9 */ bne $v0,$t8,.L0f0326fc
|
||||
/* f031fd8: 3c198006 */ lui $t9,%hi(var800652bc)
|
||||
/* f031fd8: 3c198006 */ lui $t9,0x8006
|
||||
/* f031fdc: 0c00744f */ jal animGetId
|
||||
/* f031fe0: 8e040020 */ lw $a0,0x20($s0)
|
||||
/* f031fe4: 24010269 */ addiu $at,$zero,0x269
|
||||
|
|
@ -4783,8 +4783,8 @@ glabel func0f0319a8
|
|||
/* f032178: 304f0003 */ andi $t7,$v0,0x3
|
||||
/* f03217c: 000fc0c0 */ sll $t8,$t7,0x3
|
||||
/* f032180: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f032184: 3c0e8006 */ lui $t6,%hi(var80063970)
|
||||
/* f032188: 25ce3970 */ addiu $t6,$t6,%lo(var80063970)
|
||||
/* f032184: 3c0e8006 */ lui $t6,0x8006
|
||||
/* f032188: 25ce3970 */ addiu $t6,$t6,0x3970
|
||||
/* f03218c: 0018c080 */ sll $t8,$t8,0x2
|
||||
/* f032190: 030e1821 */ addu $v1,$t8,$t6
|
||||
/* f032194: c46a0014 */ lwc1 $f10,0x14($v1)
|
||||
|
|
@ -5009,8 +5009,8 @@ glabel func0f0319a8
|
|||
/* f0324cc: 01ed7823 */ subu $t7,$t7,$t5
|
||||
/* f0324d0: 000f7880 */ sll $t7,$t7,0x2
|
||||
/* f0324d4: 0018c080 */ sll $t8,$t8,0x2
|
||||
/* f0324d8: 3c198006 */ lui $t9,%hi(var80064e1c)
|
||||
/* f0324dc: 27394e1c */ addiu $t9,$t9,%lo(var80064e1c)
|
||||
/* f0324d8: 3c198006 */ lui $t9,0x8006
|
||||
/* f0324dc: 27394e1c */ addiu $t9,$t9,0x4e1c
|
||||
/* f0324e0: 030f7021 */ addu $t6,$t8,$t7
|
||||
/* f0324e4: 01d94021 */ addu $t0,$t6,$t9
|
||||
/* f0324e8: 04800022 */ bltz $a0,.L0f032574
|
||||
|
|
@ -5044,8 +5044,8 @@ glabel func0f0319a8
|
|||
/* f032550: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f032554: 920f032f */ lbu $t7,0x32f($s0)
|
||||
.L0f032558:
|
||||
/* f032558: 3c0d8006 */ lui $t5,%hi(var80064e1c)
|
||||
/* f03255c: 25ad4e1c */ addiu $t5,$t5,%lo(var80064e1c)
|
||||
/* f032558: 3c0d8006 */ lui $t5,0x8006
|
||||
/* f03255c: 25ad4e1c */ addiu $t5,$t5,0x4e1c
|
||||
/* f032560: 000f70c0 */ sll $t6,$t7,0x3
|
||||
/* f032564: 01cf7023 */ subu $t6,$t6,$t7
|
||||
/* f032568: 000e7080 */ sll $t6,$t6,0x2
|
||||
|
|
@ -5057,8 +5057,8 @@ glabel func0f0319a8
|
|||
.L0f03257c:
|
||||
/* f03257c: 0304c023 */ subu $t8,$t8,$a0
|
||||
/* f032580: 0018c080 */ sll $t8,$t8,0x2
|
||||
/* f032584: 3c0e8006 */ lui $t6,%hi(var80064e1c)
|
||||
/* f032588: 25ce4e1c */ addiu $t6,$t6,%lo(var80064e1c)
|
||||
/* f032584: 3c0e8006 */ lui $t6,0x8006
|
||||
/* f032588: 25ce4e1c */ addiu $t6,$t6,0x4e1c
|
||||
/* f03258c: 270fffe4 */ addiu $t7,$t8,-28
|
||||
/* f032590: 01ee4021 */ addu $t0,$t7,$t6
|
||||
.L0f032594:
|
||||
|
|
@ -5160,7 +5160,7 @@ glabel func0f0319a8
|
|||
/* f0326f4: 100000ae */ beqz $zero,.L0f0329b0
|
||||
/* f0326f8: 8fa20040 */ lw $v0,0x40($sp)
|
||||
.L0f0326fc:
|
||||
/* f0326fc: 273952bc */ addiu $t9,$t9,%lo(var800652bc)
|
||||
/* f0326fc: 273952bc */ addiu $t9,$t9,0x52bc
|
||||
/* f032700: 145900ab */ bne $v0,$t9,.L0f0329b0
|
||||
/* f032704: 3c017f1b */ lui $at,%hi(var7f1a8d40)
|
||||
/* f032708: c42a8d40 */ lwc1 $f10,%lo(var7f1a8d40)($at)
|
||||
|
|
@ -5376,8 +5376,8 @@ glabel func0f0319a8
|
|||
/* f032a24: 3c0f8006 */ lui $t7,%hi(var800652b8)
|
||||
/* f032a28: 25ef52b8 */ addiu $t7,$t7,%lo(var800652b8)
|
||||
/* f032a2c: 104f0004 */ beq $v0,$t7,.L0f032a40
|
||||
/* f032a30: 3c188006 */ lui $t8,%hi(var800652bc)
|
||||
/* f032a34: 271852bc */ addiu $t8,$t8,%lo(var800652bc)
|
||||
/* f032a30: 3c188006 */ lui $t8,0x8006
|
||||
/* f032a34: 271852bc */ addiu $t8,$t8,0x52bc
|
||||
/* f032a38: 5458001e */ bnel $v0,$t8,.L0f032ab4
|
||||
/* f032a3c: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f032a40:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -476,9 +476,9 @@ glabel func0f000648
|
|||
/* f000760: 0275082b */ sltu $at,$s3,$s5
|
||||
/* f000764: 1420ffc8 */ bnez $at,.L0f000688
|
||||
/* f000768: 26520004 */ addiu $s2,$s2,0x4
|
||||
/* f00076c: 3c048006 */ lui $a0,%hi(var80063970)
|
||||
/* f00076c: 3c048006 */ lui $a0,0x8006
|
||||
/* f000770: 0fc00164 */ jal func0f000590
|
||||
/* f000774: 24843970 */ addiu $a0,$a0,%lo(var80063970)
|
||||
/* f000774: 24843970 */ addiu $a0,$a0,0x3970
|
||||
/* f000778: 3c118006 */ lui $s1,%hi(var80065ae0)
|
||||
/* f00077c: 3c128006 */ lui $s2,%hi(var800662d8)
|
||||
/* f000780: 3c138006 */ lui $s3,%hi(var800666c8)
|
||||
|
|
|
|||
|
|
@ -1289,6 +1289,7 @@
|
|||
#define NUM_MPHEADS 75
|
||||
#define NUM_MPPRESETS 14
|
||||
#define NUM_MPTRACKS 42
|
||||
#define NUM_RACES 5
|
||||
#define NUM_SMOKETYPES 23
|
||||
#define NUM_SOLONORMALSTAGES 17
|
||||
#define NUM_SOLOSTAGES 21
|
||||
|
|
|
|||
|
|
@ -125,9 +125,7 @@ extern u32 var80062cb0;
|
|||
extern u32 var80062cb4;
|
||||
extern u32 var80062cb8;
|
||||
extern s32 var80062cbc;
|
||||
extern u32 var80063970;
|
||||
extern u32 var80064e1c;
|
||||
extern u32 var800652b8;
|
||||
extern struct somedruggedracething *var800652b8[NUM_RACES];
|
||||
extern u32 var800652bc;
|
||||
extern u32 var800652c0;
|
||||
extern u32 var800652c8;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ u32 func0001d320(void);
|
|||
u32 func0001d4fc(void);
|
||||
u32 func0001d62c(void);
|
||||
u32 func0001db94(struct animdata *animdata);
|
||||
u32 func0001dbfc(void);
|
||||
void func0001dbfc(struct animdata *animdata, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
|
||||
void func0001dccc(struct animdata *animdata, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
|
||||
u32 func0001dd90(void);
|
||||
void func0001ddec(struct animdata *animdata, f32 arg1, f32 arg2);
|
||||
|
|
|
|||
|
|
@ -477,6 +477,12 @@ struct act_druggedko {
|
|||
/*0x3c*/ u32 unk03c;
|
||||
};
|
||||
|
||||
struct act_druggedcomingup {
|
||||
/*0x2c*/ s16 unk02c; // timer
|
||||
/*0x30*/ f32 unk030;
|
||||
/*0x34*/ f32 unk034;
|
||||
};
|
||||
|
||||
struct act_attackamount {
|
||||
/*0x2c*/ u32 unk02c;
|
||||
/*0x30*/ u16 unk030;
|
||||
|
|
@ -549,6 +555,7 @@ struct chrdata {
|
|||
struct act_throwgrenade act_throwgrenade;
|
||||
struct act_druggeddrop act_druggeddrop;
|
||||
struct act_druggedko act_druggedko;
|
||||
struct act_druggedcomingup act_druggedcomingup;
|
||||
struct act_attackamount act_attackamount;
|
||||
struct act_skjump act_skjump;
|
||||
};
|
||||
|
|
@ -5158,4 +5165,22 @@ struct var80087d14 {
|
|||
s32 blurdrugamount;
|
||||
};
|
||||
|
||||
struct somedruggedracethingdeep {
|
||||
s16 unk00;
|
||||
u32 unk04;
|
||||
f32 unk08;
|
||||
f32 unk0c;
|
||||
u32 unk10;
|
||||
f32 unk14;
|
||||
f32 unk18;
|
||||
};
|
||||
|
||||
struct somedruggedracething {
|
||||
s32 index;
|
||||
struct somedruggedracethingdeep *unk04;
|
||||
struct somedruggedracethingdeep *unk08;
|
||||
s32 unk0c;
|
||||
u32 unk10;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue