diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index a8e214f76..260cfcc43 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -4683,7 +4683,7 @@ glabel var7f1a8224 /* f010218: 02402025 */ or $a0,$s2,$zero /* f01021c: 1000001c */ beqz $zero,.L0f010290 /* f010220: 00000000 */ sll $zero,$zero,0x0 -/* f010224: 0fc042bb */ jal func0f010aec +/* f010224: 0fc042bb */ jal objectiveAddMultiroomEnteredCriteria /* f010228: 02402025 */ or $a0,$s2,$zero /* f01022c: 10000018 */ beqz $zero,.L0f010290 /* f010230: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 9a2cce049..38e7f1953 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -107,15 +107,11 @@ glabel func0f010ad4 /* f010ae8: ac440000 */ sw $a0,0x0($v0) ); -GLOBAL_ASM( -glabel func0f010aec -/* f010aec: 3c02800a */ lui $v0,%hi(g_MultiroomEnteredCriterias) -/* f010af0: 2442d0bc */ addiu $v0,$v0,%lo(g_MultiroomEnteredCriterias) -/* f010af4: 8c4e0000 */ lw $t6,0x0($v0) -/* f010af8: ac8e0010 */ sw $t6,0x10($a0) -/* f010afc: 03e00008 */ jr $ra -/* f010b00: ac440000 */ sw $a0,0x0($v0) -); +void objectiveAddMultiroomEnteredCriteria(struct criteria_multiroomentered *criteria) +{ + criteria->next = g_MultiroomEnteredCriterias; + g_MultiroomEnteredCriterias = criteria; +} void objectiveAddHolographCriteria(struct criteria_holograph *criteria) { diff --git a/src/include/game/game_0109d0.h b/src/include/game/game_0109d0.h index 168a08b62..9abfb8ceb 100644 --- a/src/include/game/game_0109d0.h +++ b/src/include/game/game_0109d0.h @@ -8,7 +8,7 @@ u32 func0f010a68(void); u32 func0f010a80(void); u32 func0f010a98(void); u32 func0f010ad4(void); -u32 func0f010aec(void); +void objectiveAddMultiroomEnteredCriteria(struct criteria_multiroomentered *criteria); void objectiveAddHolographCriteria(struct criteria_holograph *criteria); #endif