diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 48a5adff0..087f75c84 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -374,6 +374,15 @@ glabel func0f0b656c /* f0b65a4: 46001006 */ mov.s $f0,$f2 ); +// Mismatch due to rodata - this file needs to be split somewhere after this +// function and prior to the "tps" string. +//f32 func0f0b656c(s32 arg0) +//{ +// f32 value = ((var8009ddc8[arg0] & 0xf00) >> 8) * 0.06666667f; +// +// return value; +//} + GLOBAL_ASM( glabel func0f0b65a8 /* f0b65a8: 27bdffe8 */ addiu $sp,$sp,-24 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index ec115cfb1..db2d1cce9 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -14787,7 +14787,7 @@ u32 var8009ddb8 = 0; u32 var8009ddbc = 0; u32 var8009ddc0 = 0; u32 var8009ddc4 = 0; -u32 var8009ddc8 = 0; +u16 *var8009ddc8 = NULL; s32 var8009ddcc = 0; s32 g_DefaultWeapon = 0; s32 g_DefaultWeaponArgument = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 2aab57afc..6a3992fea 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -605,7 +605,7 @@ extern u32 var8009dd60; extern u32 var8009dd6c; extern u32 var8009dd70; extern u32 var8009dd78; -extern u32 var8009ddc8; +extern u16 *var8009ddc8; extern s32 var8009ddcc; extern s32 g_DefaultWeapon; extern s32 g_DefaultWeaponArgument;