From a5489aeef4aa9e6243cc921122b390b8be20bda4 Mon Sep 17 00:00:00 2001
From: Melody <melody@pallet.town>
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_ground_effect.s | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'asm/field_ground_effect.s')

diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
index 4fc86db2c..b72d8f776 100644
--- a/asm/field_ground_effect.s
+++ b/asm/field_ground_effect.s
@@ -186,7 +186,7 @@ GetGroundEffectFlags_TallGrassOnSpawn: @ 8067CA8
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl sub_8059F34
+	bl MetatileBehavior_IsTallGrass_2
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067CC0
@@ -205,7 +205,7 @@ GetGroundEffectFlags_TallGrassOnBeginStep: @ 8067CC8
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl sub_8059F34
+	bl MetatileBehavior_IsTallGrass_2
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067CE0
@@ -224,7 +224,7 @@ GetGroundEffectFlags_LongGrassOnSpawn: @ 8067CE8
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl sub_8059F4C
+	bl MetatileBehavior_ReturnFalse_3
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067D00
@@ -243,7 +243,7 @@ GetGroundEffectFlags_LongGrassOnBeginStep: @ 8067D08
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl sub_8059F4C
+	bl MetatileBehavior_ReturnFalse_3
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067D20
@@ -263,7 +263,7 @@ GetGroundEffectFlags_Tracks: @ 8067D28
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x1F]
-	bl sub_8059B8C
+	bl MetatileBehavior_ReturnFalse
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067D42
@@ -273,12 +273,12 @@ GetGroundEffectFlags_Tracks: @ 8067D28
 	b _08067D5E
 _08067D42:
 	ldrb r0, [r4, 0x1F]
-	bl sub_8059B5C
+	bl MetatileBehavior_IsMB21OrSand
 	lsls r0, 24
 	cmp r0, 0
 	bne _08067D5A
 	ldrb r0, [r4, 0x1F]
-	bl sub_8059F54
+	bl MetatileBehavior_ReturnFalse_5
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067D62
@@ -300,12 +300,12 @@ GetGroundEffectFlags_SandHeap: @ 8067D68
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x1E]
-	bl sub_8059B8C
+	bl MetatileBehavior_ReturnFalse
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067DA6
 	ldrb r0, [r4, 0x1F]
-	bl sub_8059B8C
+	bl MetatileBehavior_ReturnFalse
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067DA6
@@ -343,23 +343,23 @@ GetGroundEffectFlags_ShallowFlowingWater: @ 8067DB8
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x1E]
-	bl sub_8059FE0
+	bl MetatileBehavior_IsWaterfallBottom
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067DD6
 	ldrb r0, [r4, 0x1F]
-	bl sub_8059FE0
+	bl MetatileBehavior_IsWaterfallBottom
 	lsls r0, 24
 	cmp r0, 0
 	bne _08067DEE
 _08067DD6:
 	ldrb r0, [r4, 0x1E]
-	bl sub_805A12C
+	bl MetatileBehavior_ReturnFalse_10
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067E0C
 	ldrb r0, [r4, 0x1F]
-	bl sub_805A12C
+	bl MetatileBehavior_ReturnFalse_10
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067E0C
@@ -397,12 +397,12 @@ GetGroundEffectFlags_Puddle: @ 8067E1C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x1E]
-	bl sub_8059F20
+	bl MetatileBehavior_IsPuddle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067E44
 	ldrb r0, [r4, 0x1F]
-	bl sub_8059F20
+	bl MetatileBehavior_IsPuddle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067E44
@@ -422,7 +422,7 @@ GetGroundEffectFlags_Ripple: @ 8067E4C
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl sub_8059F08
+	bl MetatileBehavior_IsPondWaterOrPuddle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067E66
@@ -443,12 +443,12 @@ GetGroundEffectFlags_ShortGrass: @ 8067E6C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x1E]
-	bl sub_805A0EC
+	bl MetatileBehavior_ReturnFalse_8
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067EAA
 	ldrb r0, [r4, 0x1F]
-	bl sub_805A0EC
+	bl MetatileBehavior_ReturnFalse_8
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067EAA
@@ -528,7 +528,7 @@ GetGroundEffectFlags_Seaweed: @ 8067F0C
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl sub_805A220
+	bl MetatileBehavior_IsMB22
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067F26
@@ -763,7 +763,7 @@ GetReflectionTypeByMetatileBehavior: @ 80680C8
 	b _080680F0
 _080680DE:
 	adds r0, r4, 0
-	bl sub_8059B90
+	bl MetatileBehavior_IsReflective
 	lsls r0, 24
 	cmp r0, 0
 	bne _080680EE
@@ -838,12 +838,12 @@ FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
 	cmp r0, 0
 	blt _080681A8
 	ldrb r0, [r5, 0x1E]
-	bl sub_8059F4C
+	bl MetatileBehavior_ReturnFalse_3
 	lsls r0, 24
 	cmp r0, 0
 	beq _080681A8
 	ldrb r0, [r5, 0x1F]
-	bl sub_8059F4C
+	bl MetatileBehavior_ReturnFalse_3
 	lsls r0, 24
 	cmp r0, 0
 	beq _080681A8
-- 
cgit v1.2.3