diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 5f8a175cb..afd1b479f 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -54632,12 +54632,13 @@ struct defaultobj *objFindByTagId(s32 tag_id) return obj; } +s32 objectiveGetCount(void) +{ + return var8006ae70 + 1; +} + GLOBAL_ASM( -glabel objectiveGetCount -/* f0955f4: 3c028007 */ lui $v0,0x8007 -/* f0955f8: 8c42ae70 */ lw $v0,-0x5190($v0) -/* f0955fc: 03e00008 */ jr $ra -/* f095600: 24420001 */ addiu $v0,$v0,0x1 +glabel func0f095604 /* f095604: 27bdffe8 */ addiu $sp,$sp,-24 /* f095608: 2881000a */ slti $at,$a0,0xa /* f09560c: 1020000b */ beqz $at,.L0f09563c diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h index b3951b507..7f9af5d25 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/setup/setup_000000.h @@ -551,7 +551,7 @@ extern s8 var8006ae24; extern s8 var8006ae28; extern u32 var8006ae3c; extern u32 var8006ae5c; -extern u32 var8006ae70; +extern s32 var8006ae70; extern u32 var8006ae80; extern u32 var8006ae90; extern u32 var8006af0c; diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index da37d931e..a4253f1c4 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -16535,7 +16535,7 @@ u32 var8006ae60 = 0x80b280b3; u32 var8006ae64 = 0x80b480b5; u32 var8006ae68 = 0x00000000; u32 var8006ae6c = 0x00000000; -u32 var8006ae70 = 0xffffffff; +s32 var8006ae70 = -1; u32 var8006ae74 = 0x00000000; u32 var8006ae78 = 0x00000000; u32 var8006ae7c = 0x00000000;