diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:47:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:47:45 -0400 |
| commit | 89bcf3cbd9ad9d3c3631159c5ba20d3660819066 (patch) | |
| tree | aa2b318b4763fe39fd4ffc19ac7356dabba7034f /data/scripts/berry_blender.inc | |
| parent | a88676094b37951bd83b81cf610ddf92d7be0736 (diff) | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
Merge branch 'master' into add-localids
Diffstat (limited to 'data/scripts/berry_blender.inc')
| -rw-r--r-- | data/scripts/berry_blender.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 61438e17d..d98add74d 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -608,15 +608,15 @@ BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB waitmessage special TryBerryBlenderLinkup waitstate - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq BerryBlender_EventScript_SpawnLinkPartners - compare VAR_RESULT, 2 + compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY goto_if_eq BerryBlender_EventScript_CloseLinkNotReady - compare VAR_RESULT, 3 + compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq BerryBlender_EventScript_CloseLink - compare VAR_RESULT, 6 + compare VAR_RESULT, LINKUP_CONNECTION_ERROR goto_if_eq BerryBlender_EventScript_LinkError end @@ -720,22 +720,22 @@ BerryBlender_EventScript_DecideLinkLeader: @ 82941F8 BerryBlender_EventScript_TryLeadGroup: @ 8294235 call BerryBlender_EventScript_TryBecomeLinkLeader - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq BerryBlender_EventScript_LinkLeaderDecided - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq BerryBlender_EventScript_DecideLinkLeader - compare VAR_RESULT, 8 + compare VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN goto_if_eq BerryBlender_EventScript_TryLeadGroup release end BerryBlender_EventScript_TryJoinGroup: @ 829425D call BerryBlender_EventScript_TryJoinLinkGroup - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq BerryBlender_EventScript_LinkLeaderDecided - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq BerryBlender_EventScript_DecideLinkLeader - compare VAR_RESULT, 8 + compare VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN goto_if_eq BerryBlender_EventScript_TryJoinGroup release end |