Skip to content

Commit 71dd8c1

Browse files
authored
Added 3 functions in game_122650 (#16)
* Added three functions in game_122650.c * Update game_122650.c Fixed formatting and removed temp variables.
1 parent e6e0e29 commit 71dd8c1

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed

conker/conker.us.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ segments:
546546
- [0x11f780, asm]
547547
- [0x11ff10, asm]
548548
- [0x121a20, asm]
549-
- [0x122650, asm]
549+
- [0x122650, c, game/done/game_122650]
550550
- [0x122760, asm]
551551
- [0x1227f0, asm]
552552
- [0x1228d0, asm]

conker/include/functions.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,9 @@ void func_150DE32C(void); // dummy
714714
void func_150DEC90(s32 arg0);
715715
void func_150EB430(void *arg0, void *arg1);
716716
void func_150EC4B0(struct108 *arg0);
717+
void func_150F51A0(s32 arg0, s32 arg1);
718+
s32 func_150F51BC(void);
719+
void func_150F51E8(s32 arg0);
717720
void func_150FCA00(struct108 *arg0);
718721

719722
void func_15100330(s32 arg0);

conker/src/game/done/game_122650.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#include <ultra64.h>
2+
#include "functions.h"
3+
#include "variables.h"
4+
5+
6+
extern u8 D_80088B44;
7+
extern s32 D_800CC454;
8+
9+
void func_150F51A0(s32 arg0, s32 arg1) {
10+
D_80088B40 = 1;
11+
}
12+
13+
s32 func_150F51BC(void) {
14+
if (D_80088B40 != 0) {
15+
D_80088B40 = 0;
16+
return 1;
17+
} else {
18+
return 0;
19+
}
20+
}
21+
22+
void func_150F51E8(s32 arg0) {
23+
if (((D_800CC454 & 0X1F) == 3) || ((D_800CC454 & 0x1F) == 4)) {
24+
if (D_800BE9E4 < D_80088B44){
25+
if(D_800C35EA != 1) {
26+
D_80088B44 = (D_80088B44 - D_800BE9E4);
27+
}
28+
} else {
29+
D_80088B44 = ((func_150ADA20() & 0x3F) + 0xC0);
30+
func_10010F30(15, 18000, ((func_150ADA20() & 0x3F) + 0x20), 0, 0);
31+
}
32+
}
33+
}

0 commit comments

Comments
 (0)