From a5489aeef4aa9e6243cc921122b390b8be20bda4 Mon Sep 17 00:00:00 2001 From: Melody Date: Fri, 9 Nov 2018 23:10:05 -0500 Subject: Decompiles metatile behaviors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Combines commits: * WIP: start on metatile behavior functions * WIP: more functions * WIP: more functions * WIP: another solid chunk + cleanup * WIP: more things are stuff * WIP: even more stuff done * WIP: 🆗 * WIP: Cleaning Up * WIP: More Cleanup * WIP: Additional Cleanup * WIP: clean up defines --- asm/field_map_obj.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'asm/field_map_obj.s') diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 84f023d19..5afe13b87 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -11129,7 +11129,7 @@ _08062ED0: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r3, _08062F04 @ =sub_8059B44 + ldr r3, _08062F04 @ =MetatileBehavior_IsTallGrass ldr r4, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -11142,7 +11142,7 @@ _08062EF8: bx r1 .align 2, 0 _08062F00: .4byte gUnknown_83A6390 -_08062F04: .4byte sub_8059B44 +_08062F04: .4byte MetatileBehavior_IsTallGrass thumb_func_end mss_08062EA4 thumb_func_start FieldObjectCB_TreeDisguise @@ -13373,13 +13373,13 @@ sub_8063E28: @ 8063E28 bl sub_8064544 _08063E5C: ldrb r0, [r4, 0x1E] - bl sub_8059DAC + bl MetatileBehavior_IsIce_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08063E78 ldrb r0, [r4, 0x1E] - bl sub_8059DC0 + bl MetatileBehavior_IsUnknownMovement48 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 -- cgit v1.2.3