start decompiling fldeff_cut.c

2 files changed, 113 insertions, 204 deletions

diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index a56ad32fa..028a61cc8 100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -6,210 +6,6 @@
 
 	.text
 
-	thumb_func_start SetUpFieldMove_Cut
-SetUpFieldMove_Cut: @ 80A2504
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	movs r0, 0x52
-	bl npc_before_player_of_type
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080A2534
-	ldr r1, _080A2524 @ =gUnknown_0300485C
-	ldr r0, _080A2528 @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _080A252C @ =gUnknown_03005CE4
-	ldr r0, _080A2530 @ =sub_80A2634
-	b _080A25A8
-	.align 2, 0
-_080A2524: .4byte gUnknown_0300485C
-_080A2528: .4byte sub_808AB90
-_080A252C: .4byte gUnknown_03005CE4
-_080A2530: .4byte sub_80A2634
-_080A2534:
-	ldr r4, _080A25B0 @ =gUnknown_0203923C
-	adds r1, r4, 0x2
-	adds r0, r4, 0
-	bl PlayerGetDestCoords
-	movs r7, 0
-	mov r8, r4
-_080A2542:
-	ldr r1, _080A25B4 @ =0x0000ffff
-	adds r0, r7, r1
-	mov r2, r8
-	ldrh r2, [r2, 0x2]
-	adds r0, r2
-	movs r6, 0
-	lsls r0, 16
-	asrs r5, r0, 16
-_080A2552:
-	ldr r1, _080A25B4 @ =0x0000ffff
-	adds r0, r6, r1
-	mov r2, r8
-	ldrh r2, [r2]
-	adds r0, r2
-	lsls r0, 16
-	asrs r4, r0, 16
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	mov r2, r8
-	movs r1, 0x4
-	ldrsb r1, [r2, r1]
-	cmp r0, r1
-	bne _080A25C8
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsPokeGrass
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080A259E
-	adds r0, r4, 0
-	bl MetatileBehavior_IsAsh
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080A25C8
-_080A259E:
-	ldr r1, _080A25B8 @ =gUnknown_0300485C
-	ldr r0, _080A25BC @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _080A25C0 @ =gUnknown_03005CE4
-	ldr r0, _080A25C4 @ =sub_80A25E8
-_080A25A8:
-	str r0, [r1]
-	movs r0, 0x1
-	b _080A25DE
-	.align 2, 0
-_080A25B0: .4byte gUnknown_0203923C
-_080A25B4: .4byte 0x0000ffff
-_080A25B8: .4byte gUnknown_0300485C
-_080A25BC: .4byte sub_808AB90
-_080A25C0: .4byte gUnknown_03005CE4
-_080A25C4: .4byte sub_80A25E8
-_080A25C8:
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x2
-	bls _080A2552
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x2
-	bls _080A2542
-	movs r0, 0
-_080A25DE:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end SetUpFieldMove_Cut
-
-	thumb_func_start sub_80A25E8
-sub_80A25E8: @ 80A25E8
-	push {lr}
-	movs r0, 0x1
-	bl FieldEffectStart
-	ldr r0, _080A25FC @ =gUnknown_0202FF84
-	ldr r1, _080A2600 @ =gUnknown_03005CE0
-	ldrb r1, [r1]
-	str r1, [r0]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A25FC: .4byte gUnknown_0202FF84
-_080A2600: .4byte gUnknown_03005CE0
-	thumb_func_end sub_80A25E8
-
-	thumb_func_start FldEff_UseCutOnGrass
-FldEff_UseCutOnGrass: @ 80A2604
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080A262C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080A2630 @ =sub_80A2684
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	movs r0, 0x12
-	bl IncrementGameStat
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A262C: .4byte gTasks
-_080A2630: .4byte sub_80A2684
-	thumb_func_end FldEff_UseCutOnGrass
-
-	thumb_func_start sub_80A2634
-sub_80A2634: @ 80A2634
-	push {lr}
-	ldr r1, _080A2648 @ =gUnknown_0202FF84
-	ldr r0, _080A264C @ =gUnknown_03005CE0
-	ldrb r0, [r0]
-	str r0, [r1]
-	ldr r0, _080A2650 @ =UseCutScript
-	bl ScriptContext1_SetupScript
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A2648: .4byte gUnknown_0202FF84
-_080A264C: .4byte gUnknown_03005CE0
-_080A2650: .4byte UseCutScript
-	thumb_func_end sub_80A2634
-
-	thumb_func_start FldEff_UseCutOnTree
-FldEff_UseCutOnTree: @ 80A2654
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080A267C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080A2680 @ =sub_80A2B00
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	movs r0, 0x12
-	bl IncrementGameStat
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A267C: .4byte gTasks
-_080A2680: .4byte sub_80A2B00
-	thumb_func_end FldEff_UseCutOnTree
-
-	thumb_func_start sub_80A2684
-sub_80A2684: @ 80A2684
-	push {lr}
-	movs r0, 0x1
-	bl FieldEffectActiveListRemove
-	movs r0, 0x3A
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A2684
-
 	thumb_func_start FldEff_CutGrass
 FldEff_CutGrass: @ 80A2698
 	push {r4-r7,lr}
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
new file mode 100644
index 000000000..4d7e4fb61
--- /dev/null
+++ b/src/fldeff_cut.c
@@ -0,0 +1,113 @@
+#include "global.h"
+#include "asm.h"
+#include "metatile_behavior.h"
+#include "field_player_avatar.h"
+#include "field_effect.h"
+#include "rom4.h"
+#include "script.h"
+#include "rom6.h"
+
+extern void (*gUnknown_0300485C)(void);
+extern void (*gUnknown_03005CE4)(void);
+
+extern struct MapPosition gUnknown_0203923C;
+
+extern u8 gUnknown_03005CE0;
+extern u32 gUnknown_0202FF84;
+
+extern u8 UseCutScript;
+
+extern void sub_808AB90(void); // unknown args
+extern void sub_80A2634(void); // unknown args
+extern void sub_80A25E8(void); // unknown args
+extern void sub_80A2684(void); // unknown args
+extern void sub_80A2B00(void); // unknown args
+
+bool8 SetUpFieldMove_Cut(void)
+{
+	s16 x, y;
+	u8 i, j;
+	u8 tileBehavior;
+
+	if(npc_before_player_of_type(0x52) == TRUE) // is in front of tree?
+	{
+		gUnknown_0300485C = sub_808AB90;
+		gUnknown_03005CE4 = sub_80A2634;
+		return TRUE;
+	}
+	else // is in ash or grass to cut?
+	{
+		PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y);
+		for(i = 0; i < 3; i++)
+		{
+			y = i - 1 + gUnknown_0203923C.y;
+			for(j = 0; j < 3; j++)
+			{
+				x = j - 1 + gUnknown_0203923C.x;
+				if(MapGridGetZCoordAt(x, y) == (s8)gUnknown_0203923C.height)
+				{
+					tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+					if(MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
+					|| MetatileBehavior_IsAsh(tileBehavior) == TRUE)
+					{
+						gUnknown_0300485C = sub_808AB90;
+						gUnknown_03005CE4 = sub_80A25E8;
+						return TRUE;
+					}
+				}
+			}
+		}
+		return FALSE; // do not use cut
+	}
+}
+
+void sub_80A25E8(void)
+{
+	FieldEffectStart(1);
+	gUnknown_0202FF84 = gUnknown_03005CE0;
+}
+
+bool8 FldEff_UseCutOnGrass(void)
+{
+	u8 taskId = oei_task_add();
+	
+	gTasks[taskId].data[8] = (u32)sub_80A2684 >> 16;
+	gTasks[taskId].data[9] = (u32)sub_80A2684;
+	IncrementGameStat(0x12);
+	return FALSE;
+}
+
+void sub_80A2634(void)
+{
+	gUnknown_0202FF84 = gUnknown_03005CE0;
+	ScriptContext1_SetupScript(&UseCutScript);
+}
+
+bool8 FldEff_UseCutOnTree(void)
+{
+	u8 taskId = oei_task_add();
+	
+	gTasks[taskId].data[8] = (u32)sub_80A2B00 >> 16;
+	gTasks[taskId].data[9] = (u32)sub_80A2B00;
+	IncrementGameStat(0x12);
+	return FALSE;
+}
+
+void sub_80A2684(void)
+{
+	FieldEffectActiveListRemove(1);
+	FieldEffectStart(0x3A);
+}
+
+/*
+	thumb_func_start sub_80A2684
+sub_80A2684: @ 80A2684
+	push {lr}
+	movs r0, 0x1
+	bl FieldEffectActiveListRemove
+	movs r0, 0x3A
+	bl FieldEffectStart
+	pop {r0}
+	bx r0
+	thumb_func_end sub_80A2684
+*/