diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 260cfcc43..f087f0595 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -4679,7 +4679,7 @@ glabel var7f1a8224 /* f010208: 002e0821 */ addu $at,$at,$t6 /* f01020c: 10000020 */ beqz $zero,.L0f010290 /* f010210: a42ddfd6 */ sh $t5,%lo(g_Briefing+0xe)($at) -/* f010214: 0fc042b5 */ jal func0f010ad4 +/* f010214: 0fc042b5 */ jal objectiveAddRoomEnteredCriteria /* f010218: 02402025 */ or $a0,$s2,$zero /* f01021c: 1000001c */ beqz $zero,.L0f010290 /* f010220: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 38e7f1953..7aa448794 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -97,15 +97,11 @@ glabel func0f010a98 /* f010ad0: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f010ad4 -/* f010ad4: 3c02800a */ lui $v0,%hi(g_RoomEnteredCriterias) -/* f010ad8: 2442d0b8 */ addiu $v0,$v0,%lo(g_RoomEnteredCriterias) -/* f010adc: 8c4e0000 */ lw $t6,0x0($v0) -/* f010ae0: ac8e000c */ sw $t6,0xc($a0) -/* f010ae4: 03e00008 */ jr $ra -/* f010ae8: ac440000 */ sw $a0,0x0($v0) -); +void objectiveAddRoomEnteredCriteria(struct criteria_roomentered *criteria) +{ + criteria->next = g_RoomEnteredCriterias; + g_RoomEnteredCriterias = criteria; +} void objectiveAddMultiroomEnteredCriteria(struct criteria_multiroomentered *criteria) { diff --git a/src/include/game/game_0109d0.h b/src/include/game/game_0109d0.h index 9abfb8ceb..c59aa8a48 100644 --- a/src/include/game/game_0109d0.h +++ b/src/include/game/game_0109d0.h @@ -7,7 +7,7 @@ void func0f0109d0(void); u32 func0f010a68(void); u32 func0f010a80(void); u32 func0f010a98(void); -u32 func0f010ad4(void); +void objectiveAddRoomEnteredCriteria(struct criteria_roomentered *criteria); void objectiveAddMultiroomEnteredCriteria(struct criteria_multiroomentered *criteria); void objectiveAddHolographCriteria(struct criteria_holograph *criteria);