diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index 008d1a807..7379c562c 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -152,6 +152,8 @@ extern u32 var8005f014; extern u32 var8005f018; extern u32 var8005f01c; extern u32 var8005f020; +extern u32 var8005f034; +extern u32 var8005f038; extern u16 *var8005f040; extern u16 *var8005f044; extern u32 var8005f048; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 54b6ded7f..d1946958a 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -456,9 +456,15 @@ extern struct animheader *var8009a898; extern u32 *g_TileFileData; extern u32 g_TileNumRooms; extern u32 *g_TileRooms; +extern u32 var8009a8ac; +extern u32 var8009a8b4; extern struct coord var8009a8b8; extern struct coord var8009a8c8; +extern u32 var8009a8d4; +extern u32 var8009a8d8; extern u32 var8009a8e0; +extern u32 var8009a8ec; +extern u32 var8009a8f4; extern u32 var8009a8f8; extern u32 var8009a908; extern u32 var8009a918; diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index 4519dde84..bd86f5af8 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -2000,26 +2000,17 @@ glabel func00024f10 /* 24f68: 00601025 */ or $v0,$v1,$zero ); -GLOBAL_ASM( -glabel func00024f6c -/* 24f6c: 3c01800a */ lui $at,%hi(var8009a8b4) -/* 24f70: ac20a8b4 */ sw $zero,%lo(var8009a8b4)($at) -/* 24f74: 3c01800a */ lui $at,%hi(var8009a8ac) -/* 24f78: ac20a8ac */ sw $zero,%lo(var8009a8ac)($at) -/* 24f7c: 3c01800a */ lui $at,%hi(var8009a8d4) -/* 24f80: ac20a8d4 */ sw $zero,%lo(var8009a8d4)($at) -/* 24f84: 3c01800a */ lui $at,%hi(var8009a8d8) -/* 24f88: ac20a8d8 */ sw $zero,%lo(var8009a8d8)($at) -/* 24f8c: 3c01800a */ lui $at,%hi(var8009a8ec) -/* 24f90: ac20a8ec */ sw $zero,%lo(var8009a8ec)($at) -/* 24f94: 3c01800a */ lui $at,%hi(var8009a8f4) -/* 24f98: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 24f9c: 3c018006 */ lui $at,%hi(var8005f034) -/* 24fa0: ac20f034 */ sw $zero,%lo(var8005f034)($at) -/* 24fa4: 3c018006 */ lui $at,%hi(var8005f038) -/* 24fa8: 03e00008 */ jr $ra -/* 24fac: ac20f038 */ sw $zero,%lo(var8005f038)($at) -); +void func00024f6c(void) +{ + var8009a8b4 = 0; + var8009a8ac = 0; + var8009a8d4 = 0; + var8009a8d8 = 0; + var8009a8ec = 0; + var8009a8f4 = 0; + var8005f034 = 0; + var8005f038 = 0; +} GLOBAL_ASM( glabel func00024fb0