SS Tidal functions in field_special.s

2 files changed, 76 insertions, 175 deletions

diff --git a/asm/field_specials.s b/asm/field_specials.s
index 136489b80..5cb240ef0 100644..100755
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -6,181 +6,6 @@
 
 	.text
 
-	thumb_func_start SetSSTidalFlag
-SetSSTidalFlag: @ 810D980
-	push {lr}
-	ldr r0, _0810D998 @ =0x0000082d
-	bl FlagSet
-	ldr r0, _0810D99C @ =0x0000404a
-	bl GetVarPointer
-	movs r1, 0
-	strh r1, [r0]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810D998: .4byte 0x0000082d
-_0810D99C: .4byte 0x0000404a
-	thumb_func_end SetSSTidalFlag
-
-	thumb_func_start ResetSSTidalFlag
-ResetSSTidalFlag: @ 810D9A0
-	push {lr}
-	ldr r0, _0810D9AC @ =0x0000082d
-	bl FlagReset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810D9AC: .4byte 0x0000082d
-	thumb_func_end ResetSSTidalFlag
-
-	thumb_func_start CountSSTidalStep
-CountSSTidalStep: @ 810D9B0
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, _0810D9DC @ =0x0000082d
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0810D9D6
-	ldr r0, _0810D9E0 @ =0x0000404a
-	bl GetVarPointer
-	ldrh r1, [r0]
-	adds r1, r4, r1
-	strh r1, [r0]
-	lsls r1, 16
-	lsrs r1, 16
-	cmp r1, 0xCC
-	bhi _0810D9E4
-_0810D9D6:
-	movs r0, 0
-	b _0810D9E6
-	.align 2, 0
-_0810D9DC: .4byte 0x0000082d
-_0810D9E0: .4byte 0x0000404a
-_0810D9E4:
-	movs r0, 0x1
-_0810D9E6:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end CountSSTidalStep
-
-	thumb_func_start GetSSTidalLocation
-GetSSTidalLocation: @ 810D9EC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	mov r8, r0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r7, r3, 0
-	ldr r0, _0810DA1C @ =0x0000404a
-	bl GetVarPointer
-	adds r4, r0, 0
-	ldr r0, _0810DA20 @ =0x000040b4
-	bl GetVarPointer
-	ldrh r0, [r0]
-	subs r0, 0x1
-	cmp r0, 0x9
-	bhi _0810DAB2
-	lsls r0, 2
-	ldr r1, _0810DA24 @ =_0810DA28
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0810DA1C: .4byte 0x0000404a
-_0810DA20: .4byte 0x000040b4
-_0810DA24: .4byte _0810DA28
-	.align 2, 0
-_0810DA28:
-	.4byte _0810DA50
-	.4byte _0810DA60
-	.4byte _0810DA54
-	.4byte _0810DA58
-	.4byte _0810DA58
-	.4byte _0810DA5C
-	.4byte _0810DA88
-	.4byte _0810DA50
-	.4byte _0810DA54
-	.4byte _0810DA5C
-_0810DA50:
-	movs r0, 0x1
-	b _0810DABE
-_0810DA54:
-	movs r0, 0x4
-	b _0810DABE
-_0810DA58:
-	movs r0, 0x2
-	b _0810DABE
-_0810DA5C:
-	movs r0, 0x3
-	b _0810DABE
-_0810DA60:
-	ldrh r0, [r4]
-	cmp r0, 0x3B
-	bhi _0810DA70
-	movs r0, 0x31
-	strb r0, [r5]
-	ldrh r0, [r4]
-	adds r0, 0x13
-	b _0810DAB0
-_0810DA70:
-	cmp r0, 0x8B
-	bhi _0810DA7E
-	movs r0, 0x30
-	strb r0, [r5]
-	ldrh r0, [r4]
-	subs r0, 0x3C
-	b _0810DAB0
-_0810DA7E:
-	movs r0, 0x2F
-	strb r0, [r5]
-	ldrh r0, [r4]
-	subs r0, 0x8C
-	b _0810DAB0
-_0810DA88:
-	ldrh r0, [r4]
-	cmp r0, 0x41
-	bhi _0810DA98
-	movs r0, 0x2F
-	strb r0, [r5]
-	ldrh r1, [r4]
-	movs r0, 0x41
-	b _0810DAAE
-_0810DA98:
-	cmp r0, 0x91
-	bhi _0810DAA6
-	movs r0, 0x30
-	strb r0, [r5]
-	ldrh r1, [r4]
-	movs r0, 0x91
-	b _0810DAAE
-_0810DAA6:
-	movs r0, 0x31
-	strb r0, [r5]
-	ldrh r1, [r4]
-	movs r0, 0xE0
-_0810DAAE:
-	subs r0, r1
-_0810DAB0:
-	strh r0, [r6]
-_0810DAB2:
-	movs r0, 0
-	mov r1, r8
-	strb r0, [r1]
-	movs r0, 0x14
-	strh r0, [r7]
-	movs r0, 0
-_0810DABE:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end GetSSTidalLocation
-
 	thumb_func_start GetLinkPartnerNames
 GetLinkPartnerNames: @ 810DAC8
 	push {r4-r7,lr}
diff --git a/src/field_specials.c b/src/field_specials.c
index 2cb2cf795..dc70ef2d5 100644..100755
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -188,3 +188,79 @@ void UpdateCyclingRoadState(void) {
         sav1_set_battle_music_maybe(SE_STOP);
     }
 }
+
+void SetSSTidalFlag(void)
+{
+    FlagSet(SYS_CRUISE_MODE);
+    *GetVarPointer(VAR_CRUISE_STEP_COUNT) = 0;
+}
+
+void ResetSSTidalFlag(void)
+{
+    FlagReset(SYS_CRUISE_MODE);
+}
+
+bool32 CountSSTidalStep(u16 delta)
+{
+    if (!FlagGet(SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
+{
+    u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT);
+    switch (*GetVarPointer(VAR_PORTHOLE))
+    {
+        case 1:
+        case 8:
+            return 1;
+        case 3:
+        case 9:
+            return 4;
+        case 4:
+        case 5:
+            return 2;
+        case 6:
+        case 10:
+            return 3;
+        case 2:
+            if (*varCruiseStepCount < 60)
+            {
+                *mapNum = MAP_ID_ROUTE134;
+                *x = *varCruiseStepCount + 19;
+            }
+            else if (*varCruiseStepCount < 140)
+            {
+                *mapNum = MAP_ID_ROUTE133;
+                *x = *varCruiseStepCount - 60;
+            }
+            else
+            {
+                *mapNum = MAP_ID_ROUTE132;
+                *x = *varCruiseStepCount - 140;
+            }
+            break;
+        case 7:
+            if (*varCruiseStepCount < 66)
+            {
+                *mapNum = MAP_ID_ROUTE132;
+                *x = 65 - *varCruiseStepCount;
+            }
+            else if (*varCruiseStepCount < 146) {
+                *mapNum = MAP_ID_ROUTE133;
+                *x = 145 - *varCruiseStepCount;
+            }
+            else
+            {
+                *mapNum = MAP_ID_ROUTE134;
+                *x = 224 - *varCruiseStepCount;
+            }
+            break;
+    }
+    *mapGroup = MAP_GROUP_ROUTE132;
+    *y = 20;
+    return 0;
+}