diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
| commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
| tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /src/roulette_util.c | |
| parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
| parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/roulette_util.c')
| -rwxr-xr-x | src/roulette_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/roulette_util.c b/src/roulette_util.c index c556a4af5..9531302d9 100755 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -11,7 +11,7 @@ void sub_8151678(struct UnkStruct0 *r0) memset(&r0->var04, 0, sizeof(r0->var04)); } -u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) +u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2) { if (!(r1 < 16) || (r0->var04[r1].var00_7)) return 0xFF; |