diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-20 09:22:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 09:22:54 -0600 |
| commit | e7e87e7a32069cc40a8267ba4bdd77d748e855ee (patch) | |
| tree | fe96bb4d73a41e12a4e39af703728a3aa00782c0 /asm/item_use.s | |
| parent | be4624024c16293356c3e10f61ea301d5c86d9ed (diff) | |
| parent | 255ae044a3e0dd9831779501c90c8da4a2370828 (diff) | |
Merge pull request #27 from melthelesbian/metatile_behavior
metatile behaviors
Diffstat (limited to 'asm/item_use.s')
| -rw-r--r-- | asm/item_use.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/item_use.s b/asm/item_use.s index 638418602..9b239520a 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -359,25 +359,25 @@ sub_80A122C: @ 80A122C cmp r0, 0x1 beq _080A129A adds r0, r4, 0 - bl sub_805A218 + bl MetatileBehavior_ReturnFalse_17 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080A129A adds r0, r4, 0 - bl sub_805A21C + bl MetatileBehavior_ReturnFalse_18 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080A129A adds r0, r4, 0 - bl sub_805A210 + bl MetatileBehavior_ReturnFalse_15 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080A129A adds r0, r4, 0 - bl sub_805A214 + bl MetatileBehavior_ReturnFalse_16 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -535,7 +535,7 @@ _080A13D0: b _080A1406 _080A13D4: adds r0, r5, 0 - bl sub_8059CA4 + bl MetatileBehavior_IsSurfable lsls r0, 24 cmp r0, 0 beq _080A13F4 @@ -551,7 +551,7 @@ _080A13D4: _080A13F4: lsls r0, r6, 24 lsrs r0, 24 - bl sub_8059F58 + bl MetatileBehavior_ReturnFalse_6 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |