diff options
| author | Melody <melody@pallet.town> | 2018-11-09 23:10:05 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-11-13 06:46:58 -0500 |
| commit | a5489aeef4aa9e6243cc921122b390b8be20bda4 (patch) | |
| tree | 20179f998504222c6907e5dfa5ae9dfe1e3e42fc /asm/field_map_obj.s | |
| parent | d387e7e0e0564752d8ce1cc74de16298df6e7a76 (diff) | |
Decompiles metatile behaviors
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
Diffstat (limited to 'asm/field_map_obj.s')
| -rw-r--r-- | asm/field_map_obj.s | 8 |
1 files changed, 4 insertions, 4 deletions
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 |