diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
| commit | 8df4982b3ff827ec0e7909484a67dc5923fac53d (patch) | |
| tree | e9b98e2ce622ab500e13b784cab807e4b5b3e615 /src/berry_blender.c | |
| parent | 3514f9dd6b48f1a0c42a4ea6cb1ab5317fa88c50 (diff) | |
| parent | 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f (diff) | |
Merge remote-tracking branch 'upstream/master' into document-trade
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 6c8d9c812..435e508f6 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1174,7 +1174,7 @@ static void sub_8080018(void) { case 0: sub_8080588(); - gLinkType = 0x4422; + gLinkType = LINKTYPE_BERRY_BLENDER; sBerryBlenderData->field_72 = 0; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { @@ -1517,7 +1517,7 @@ static void sub_80808D4(void) sBerryBlenderData->playAgainState = 0; sBerryBlenderData->loadGfxState = 0; - gLinkType = 0x4422; + gLinkType = LINKTYPE_BERRY_BLENDER; sBerryBlenderData->mainState++; break; case 1: |