diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 73a445bcc..a8e214f76 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -4687,7 +4687,7 @@ glabel var7f1a8224 /* f010228: 02402025 */ or $a0,$s2,$zero /* f01022c: 10000018 */ beqz $zero,.L0f010290 /* f010230: 00000000 */ sll $zero,$zero,0x0 -/* f010234: 0fc042c1 */ jal func0f010b04 +/* f010234: 0fc042c1 */ jal objectiveAddHolographCriteria /* f010238: 02402025 */ or $a0,$s2,$zero /* f01023c: 10000014 */ beqz $zero,.L0f010290 /* f010240: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 96cf506cd..9a2cce049 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -117,13 +117,8 @@ glabel func0f010aec /* f010b00: ac440000 */ sw $a0,0x0($v0) ); -GLOBAL_ASM( -glabel func0f010b04 -/* f010b04: 3c02800a */ lui $v0,%hi(g_HolographCriterias) -/* f010b08: 2442d0c0 */ addiu $v0,$v0,%lo(g_HolographCriterias) -/* f010b0c: 8c4e0000 */ lw $t6,0x0($v0) -/* f010b10: ac8e000c */ sw $t6,0xc($a0) -/* f010b14: 03e00008 */ jr $ra -/* f010b18: ac440000 */ sw $a0,0x0($v0) -/* f010b1c: 00000000 */ sll $zero,$zero,0x0 -); +void objectiveAddHolographCriteria(struct criteria_holograph *criteria) +{ + criteria->next = g_HolographCriterias; + g_HolographCriterias = criteria; +} diff --git a/src/include/game/game_0109d0.h b/src/include/game/game_0109d0.h index ba51d2ac1..168a08b62 100644 --- a/src/include/game/game_0109d0.h +++ b/src/include/game/game_0109d0.h @@ -9,6 +9,6 @@ u32 func0f010a80(void); u32 func0f010a98(void); u32 func0f010ad4(void); u32 func0f010aec(void); -u32 func0f010b04(void); +void objectiveAddHolographCriteria(struct criteria_holograph *criteria); #endif