diff --git a/src/game/game_113220.c b/src/game/game_113220.c index 0c6b10733..7443f16a7 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -718,25 +718,10 @@ glabel func0f1140bc /* f114128: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f11412c -/* f11412c: 3c013f00 */ lui $at,0x3f00 -/* f114130: 44812000 */ mtc1 $at,$f4 -/* f114134: 3c04800a */ lui $a0,%hi(var800a045c) -/* f114138: 8c84a244 */ lw $a0,-0x5dbc($a0) -/* f11413c: 46046182 */ mul.s $f6,$f12,$f4 -/* f114140: 27bdffe8 */ addiu $sp,$sp,-24 -/* f114144: afbf0014 */ sw $ra,0x14($sp) -/* f114148: 24060000 */ addiu $a2,$zero,0x0 -/* f11414c: 2484045c */ addiu $a0,$a0,%lo(var800a045c) -/* f114150: 44053000 */ mfc1 $a1,$f6 -/* f114154: 0c0077ac */ jal func0001deb0 -/* f114158: 00000000 */ sll $zero,$zero,0x0 -/* f11415c: 8fbf0014 */ lw $ra,0x14($sp) -/* f114160: 27bd0018 */ addiu $sp,$sp,0x18 -/* f114164: 03e00008 */ jr $ra -/* f114168: 00000000 */ sll $zero,$zero,0x0 -); +void func0f11412c(f32 speed) +{ + func0001deb0(&g_Vars.currentplayer->animdata, speed * 0.5f, 0); +} GLOBAL_ASM( glabel func0f11416c diff --git a/src/include/game/game_113220.h b/src/include/game/game_113220.h index bed660086..1310c0300 100644 --- a/src/include/game/game_113220.h +++ b/src/include/game/game_113220.h @@ -11,7 +11,7 @@ void currentPlayerSetHeadAmp(f32 headamp); u32 func0f1138a4(void); u32 func0f113f10(void); u32 func0f1140bc(void); -u32 func0f11412c(void); +void func0f11412c(f32 speed); u32 func0f11416c(void); #endif diff --git a/src/include/types.h b/src/include/types.h index 9c23899b2..c8c605542 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1269,15 +1269,7 @@ struct player { /*0x0428*/ struct coord unk0428[2]; /*0x0440*/ struct coord unk0440[2]; /*0x0458*/ s32 unk0458; - /*0x045c*/ u32 unk045c; - /*0x0460*/ u32 unk0460; - /*0x0464*/ u32 unk0464; - /*0x0468*/ u32 unk0468; - /*0x046c*/ u32 unk046c; - /*0x0470*/ u32 unk0470; - /*0x0474*/ u32 unk0474; - /*0x0478*/ u32 unk0478; - /*0x047c*/ u32 unk047c; + /*0x045c*/ struct animdata animdata; /*0x0480*/ struct eyespy *eyespy; /*0x0484*/ u32 unk0484; /*0x0488*/ u32 unk0488;