diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /src/item_pc.c | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'src/item_pc.c')
| -rw-r--r-- | src/item_pc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/item_pc.c b/src/item_pc.c index 8569844b9..60a74ac59 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -384,7 +384,7 @@ static bool8 ItemPc_DoGfxSetup(void) gMain.state++; break; case 20: - if (sub_80BF72C() != TRUE) + if ((u8)sub_80BF72C() != TRUE) gMain.state++; break; default: |