diff --git a/src/include/lib/lib_24e40.h b/src/include/lib/lib_24e40.h index 1acac4fb2..abc8ff60f 100644 --- a/src/include/lib/lib_24e40.h +++ b/src/include/lib/lib_24e40.h @@ -7,7 +7,7 @@ f32 func00024e40(void); void func00024e4c(struct coord *arg0, struct coord *arg1, u32 line, char *file); f32 func00024e98(void); -u32 func00024ea4(void); +s32 func00024ea4(void); struct prop *cdGetObstacle(void); void cdGetPos(struct coord *pos, u32 line, char *file); u32 func00024ee8(void); diff --git a/src/lib/lib_24e40.c b/src/lib/lib_24e40.c index e2946b3d8..9c7676fc4 100644 --- a/src/lib/lib_24e40.c +++ b/src/lib/lib_24e40.c @@ -18,7 +18,7 @@ union filedataptr g_TileFileData; s32 g_TileNumRooms; u32 *g_TileRooms; -u32 var8009a8ac; +s32 var8009a8ac; f32 var8009a8b0; u32 var8009a8b4; struct coord var8009a8b8; @@ -91,12 +91,10 @@ f32 func00024e98(void) return var8009a8b0; } -GLOBAL_ASM( -glabel func00024ea4 -/* 24ea4: 3c02800a */ lui $v0,%hi(var8009a8ac) -/* 24ea8: 03e00008 */ jr $ra -/* 24eac: 8c42a8ac */ lw $v0,%lo(var8009a8ac)($v0) -); +s32 func00024ea4(void) +{ + return var8009a8ac; +} struct prop *cdGetObstacle(void) {