From 3c2bf0b0f38ad0f87503467284c1e84bef455907 Mon Sep 17 00:00:00 2001
From: PSF <pkmnsnfrn@gmail.com>
Date: Sat, 4 Feb 2023 13:52:50 -0800
Subject: [PATCH] Renamed functions to match current pret counterparts, changed
 IsElevationMismatchAt to non-static

---
 include/event_object_movement.h |  1 +
 src/dexnav.c                    | 18 +++++++++---------
 src/event_object_movement.c     |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index aad161553c..28007f8a98 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -253,6 +253,7 @@ u8 GetSlideMovementAction(u32);
 u8 GetJumpMovementAction(u32);
 u8 GetJump2MovementAction(u32);
 u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
+bool8 IsElevationMismatchAt(u8, s16, s16);
 
 u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *);
 u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *);
diff --git a/src/dexnav.c b/src/dexnav.c
index fa5db45ef7..2bc6d937f5 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -668,12 +668,12 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                             break; //occurs at same z coord
                         
                         scale = 440 - (smallScan * 200) - (GetPlayerDistance(topX, topY) / 2)  - (2 * (topX + topY));
-                        weight = ((Random() % scale) < 1) && !MapGridIsImpassableAt(topX, topY);
+                        weight = ((Random() % scale) < 1) && !MapGridGetCollisionAt(topX, topY);
                     }
                     else
                     { // outdoors: grass
                         scale = 100 - (GetPlayerDistance(topX, topY) * 2);
-                        weight = (Random() % scale <= 5) && !MapGridIsImpassableAt(topX, topY);
+                        weight = (Random() % scale <= 5) && !MapGridGetCollisionAt(topX, topY);
                     }
                 }
                 break;
@@ -684,7 +684,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                     if (IsElevationMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
                         break;
 
-                    weight = (Random() % scale <= 1) && !MapGridIsImpassableAt(topX, topY);
+                    weight = (Random() % scale <= 1) && !MapGridGetCollisionAt(topX, topY);
                 }
                 break;
             default:
@@ -862,7 +862,7 @@ static void Task_InitDexNavSearch(u8 taskId)
     {
         Free(sDexNavSearchDataPtr);
         FreeMonIconPalettes();
-        ScriptContext1_SetupScript(EventScript_TooDark);
+        ScriptContext_SetupScript(EventScript_TooDark);
         DestroyTask(taskId);
         return;
     }
@@ -871,7 +871,7 @@ static void Task_InitDexNavSearch(u8 taskId)
     {
         Free(sDexNavSearchDataPtr);
         FreeMonIconPalettes();
-        ScriptContext1_SetupScript(EventScript_NotFoundNearby);
+        ScriptContext_SetupScript(EventScript_NotFoundNearby);
         DestroyTask(taskId);
         return;
     }
@@ -993,7 +993,7 @@ static void EndDexNavSearchSetupScript(const u8 *script, u8 taskId)
 {
     gSaveBlock1Ptr->dexNavChain = 0;   //reset chain
     EndDexNavSearch(taskId);
-    ScriptContext1_SetupScript(script);
+    ScriptContext_SetupScript(script);
 }
 
 static u8 GetMovementProximityBySearchLevel(void)
@@ -1081,7 +1081,7 @@ static void Task_DexNavSearch(u8 taskId)
         return;
     }
     
-    if (ScriptContext2_IsEnabled() == TRUE)
+    if (ArePlayerFieldControlsLocked() == TRUE)
     { // check if script just executed
         //gSaveBlock1Ptr->dexNavChain = 0;  //issue with reusable repels
         EndDexNavSearch(taskId);
@@ -1104,7 +1104,7 @@ static void Task_DexNavSearch(u8 taskId)
         
         FlagClear(FLAG_SYS_DEXNAV_SEARCH);
         gDexnavBattle = TRUE;        
-        ScriptContext1_SetupScript(EventScript_StartDexNavBattle);
+        ScriptContext_SetupScript(EventScript_StartDexNavBattle);
         Free(sDexNavSearchDataPtr);
         DestroyTask(taskId);
         return;
@@ -1868,7 +1868,7 @@ static void CB1_InitDexNavSearch(void)
 {
     u8 taskId;
     
-    if (!gPaletteFade.active && !ScriptContext2_IsEnabled() && gMain.callback2 == CB2_Overworld)
+    if (!gPaletteFade.active && !ArePlayerFieldControlsLocked() && gMain.callback2 == CB2_Overworld)
     {
         SetMainCallback1(CB1_Overworld);
         taskId = CreateTask(Task_InitDexNavSearch, 0);
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 1e8668d55c..031f77155c 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -163,7 +163,6 @@ static u8 DoJumpSpecialSpriteMovement(struct Sprite *);
 static void CreateLevitateMovementTask(struct ObjectEvent *);
 static void DestroyLevitateMovementTask(u8);
 static bool8 NpcTakeStep(struct Sprite *);
-static bool8 IsElevationMismatchAt(u8, s16, s16);
 static bool8 AreElevationsCompatible(u8, u8);
 
 static const struct SpriteFrameImage sPicTable_PechaBerryTree[];
@@ -7675,7 +7674,7 @@ static void SetObjectEventSpriteOamTableForLongGrass(struct ObjectEvent *objEven
         sprite->subspriteTableNum = 5;
 }
 
-static bool8 IsElevationMismatchAt(u8 elevation, s16 x, s16 y)
+bool8 IsElevationMismatchAt(u8 elevation, s16 x, s16 y)
 {
     u8 mapElevation;