diff options
| author | paul <nintendo6496@googlemail.com> | 2018-11-20 19:03:24 +0100 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-11-20 19:03:24 +0100 |
| commit | 284bbf91af43b0c9928865894cbc1d3001e57c16 (patch) | |
| tree | 99c33fee6cda995ceebc081a2d71b23ab025ffa2 /asm/party_menu.s | |
| parent | 4fc60e3f707b92e1c8912b851f0611fed4ab593a (diff) | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/party_menu.s')
| -rw-r--r-- | asm/party_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 23a1eb60a..8dd4846dd 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -12103,7 +12103,7 @@ sub_8124998: @ 8124998 bl sub_8058F78 lsls r0, 24 lsrs r0, 24 - bl sub_8059CC8 + bl MetatileBehavior_IsSemiDeepWater lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12166,7 +12166,7 @@ _08124A24: bl sub_8058F78 lsls r0, 24 lsrs r0, 24 - bl sub_8059CC8 + bl MetatileBehavior_IsSemiDeepWater lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |