From 46e957bacd9ba5538262c89bb87e1915167bb201 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Oct 2018 15:37:50 -0400 Subject: Name many functions and objects in vs_seeker.c --- asm/item_use.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/item_use.s') diff --git a/asm/item_use.s b/asm/item_use.s index e2cad1322..7a2b12d90 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1810,7 +1810,7 @@ _080A1DEC: .4byte gSaveBlock1Ptr _080A1DF0: .4byte gTasks _080A1DF4: ldr r1, _080A1E04 @ =gUnknown_2039998 - ldr r0, _080A1E08 @ =sub_810C670 + ldr r0, _080A1E08 @ =Task_VsSeeker_0 str r0, [r1] adds r0, r2, 0 bl sub_80A103C @@ -1819,7 +1819,7 @@ _080A1E00: bx r0 .align 2, 0 _080A1E04: .4byte gUnknown_2039998 -_080A1E08: .4byte sub_810C670 +_080A1E08: .4byte Task_VsSeeker_0 thumb_func_end sub_80A1D9C thumb_func_start sub_80A1E0C -- cgit v1.2.3 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/item_use.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm/item_use.s') 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 -- cgit v1.2.3