diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c index ff835db25..2b442510d 100644 --- a/src/game/data/data_02a0e0.c +++ b/src/game/data/data_02a0e0.c @@ -379,7 +379,7 @@ u32 var800844e4 = 0x00000000; u32 var800844e8 = 0x00000000; u32 var800844ec = 0x00000000; u32 var800844f0 = 0x00000000; -u32 var800844f4 = 0x00000000; +u32 var800844f4 = 0; u32 var800844f8 = 0x00000000; u32 var800844fc = 0x00000000; diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 72af9f848..fb30b99b4 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -176,14 +176,10 @@ glabel func0f1760c4 /* f176294: 27bd0018 */ addiu $sp,$sp,0x18 ); -GLOBAL_ASM( -glabel func0f176298 -/* f176298: 3c0e8008 */ lui $t6,%hi(var800844f0) -/* f17629c: 8dce44f0 */ lw $t6,%lo(var800844f0)($t6) -/* f1762a0: 3c018008 */ lui $at,%hi(var800844f4) -/* f1762a4: 03e00008 */ jr $ra -/* f1762a8: ac2e44f4 */ sw $t6,%lo(var800844f4)($at) -); +void func0f176298(void) +{ + var800844f4 = var800844f0; +} GLOBAL_ASM( glabel func0f1762ac diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h index 72a6c1499..2e2279d9b 100644 --- a/src/include/game/data/data_02a0e0.h +++ b/src/include/game/data/data_02a0e0.h @@ -23,6 +23,7 @@ extern u32 var80084220; extern struct something *somethings[]; extern u32 var800844d0; extern u32 var800844f0; +extern u32 var800844f4; extern struct stagemusic g_StageTracks[]; extern s32 var800845d8; extern u32 var800845dc; diff --git a/src/include/game/game_176080.h b/src/include/game/game_176080.h index ebe2a9658..b3ef78691 100644 --- a/src/include/game/game_176080.h +++ b/src/include/game/game_176080.h @@ -6,7 +6,7 @@ u32 func0f176080(void); u32 func0f17608c(void); u32 func0f1760c4(void); -u32 func0f176298(void); +void func0f176298(void); u32 func0f1762ac(void); u32 func0f1763f4(void); u32 func0f176668(void);