pret · PikalaxALT · Jan 30, 2026 · Jan 31, 2026 · Jan 31, 2026 · Jan 31, 2026
diff --git a/asm/include/overlay_01_021E6880.inc b/asm/include/overlay_01_021E6880.inc
@@ -14,7 +14,7 @@
 .public GameStats_GetCapped
 .public GameStats_AddScore
 .public SaveData_GetPhoneCallPersistentState
-.public sub_0202F08C
+.public PhoneCallPersistentState_CheckCallTriggerFlag
 .public Save_SafariZone_Get
 .public sub_0202F620
 .public Save_ApricornBox_Get
@@ -177,7 +177,7 @@
 .public ov01_021F6B64
 .public ov01_021FB630
 .public ov01_02206378
-.public ov02_02246C8C
+.public FieldSystem_PerformLandOrSurfEncounterCheck
 .public PlayerStepEvent_RepelCounterDecrement
 .public ov02_0224E35C
 .public ov02_0224E4CC

diff --git a/asm/include/overlay_01_021F3610.inc b/asm/include/overlay_01_021F3610.inc
@@ -8,7 +8,7 @@
 .public sub_0201F990
 .public sub_02020D2C
 .public GF_AssertFail
-.public sub_02097268
+.public GetSafariObjectConfig
 .public NNS_G3dGlbFlushP
 .public NNS_G3dGlbSetBaseTrans
 .public NNS_G3dGlbSetBaseScale

diff --git a/asm/include/overlay_01_021FC05C.inc b/asm/include/overlay_01_021FC05C.inc
@@ -27,5 +27,5 @@
 .public ov01_021EB31C
 .public GetHoneySweetScentWorkSize
 .public Task_HoneyOrSweetScent
-.public ov02_02247170
-.public ov02_02247F9C
+.public FieldSystem_PerformSweetScentEncounterCheck
+.public FieldSystem_CanGenerateStepEncounter
diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc
@@ -56,4 +56,4 @@
 .public Task_OverworldFish
 .public ov01_02200400
 .public ov01_02200540
-.public ov02_02246F70
+.public FieldSystem_PerformFishEncounterCheck
diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -182,7 +182,7 @@
 .public SavePokegear_FindEmptyPhonebookSlot
 .public SavePokegear_IsNumberRegistered
 .public SavePokegear_AllocAndCopyPhonebook
-.public sub_0202F08C
+.public PhoneCallPersistentState_CheckCallTriggerFlag
 .public Save_SafariZone_Get
 .public sub_0202F620
 .public SafariZone_GetAreaSet
@@ -238,7 +238,7 @@
 .public MetatileBehavior_IsEncounterGrass
 .public sub_0205B6F4
 .public MetatileBehavior_IsSurfableWater
-.public sub_0205B994
+.public MetatileBehavior_CanGenerateWalkingEncounters
 .public sub_0205BAD0
 .public sub_0205BAE4
 .public sub_0205BB04
@@ -343,8 +343,8 @@
 .public FreePhoneBook
 .public GetPhoneMessageGmm
 .public sub_02095FF8
-.public sub_02097268
-.public sub_020974C4
+.public GetSafariObjectConfig
+.public SafariZoneAreaSet_LoadAreaEncounters
 .public sub_02097F6C
 .public NNS_G2dGetUnpackedCharacterData
 .public NNS_G2dGetUnpackedPaletteData
@@ -458,13 +458,13 @@
 .public ov02_02246714
 .public OpenAlphHiddenRoom
 .public ov02_022469B4
-.public ov02_02246C8C
-.public ov02_02246F70
-.public ov02_022470A0
-.public ov02_02247170
-.public FieldSystem_ChooseHeadbuttEncounter
-.public ov02_02247F30
-.public ov02_02247F9C
+.public FieldSystem_PerformLandOrSurfEncounterCheck
+.public FieldSystem_PerformFishEncounterCheck
+.public FieldSystem_PerformRockSmashEncounterCheck
+.public FieldSystem_PerformSweetScentEncounterCheck
+.public FieldSystem_PerformHeadbuttEncounterCheck
+.public FieldSystem_GenerateSingleWildPokemon
+.public FieldSystem_CanGenerateStepEncounter
 .public ov02_02249458
 .public ov02_0224953C
 .public ov02_02249548
@@ -539,3 +539,5 @@
 .public ov02_02253188
 .public ov02_022531B4
 .public BugContest_GetEncounterSlot
+.public ov02_022494C4
+.public ov02_0224E340
diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc
@@ -214,7 +214,7 @@
 .public sub_020881C0
 .public sub_020910B8
 .public sub_02092B04
-.public sub_02097268
+.public GetSafariObjectConfig
 .public sub_02097720
 .public MI_CpuFill8
 .public abs

diff --git a/asm/include/overlay_108.inc b/asm/include/overlay_108.inc
@@ -197,7 +197,7 @@
 .public Save_VarsFlags_Get
 .public ChangeFlag99D
 .public BgConfig_LoadAssetFromOpenNarc
-.public sub_02097268
+.public GetSafariObjectConfig
 .public NNS_GfdGetLnkTexVramManagerWorkSize
 .public NNS_GfdGetLnkPlttVramManagerWorkSize
 .public NNS_G3dAnmObjInit

diff --git a/asm/include/unk_02097268.inc b/asm/include/unk_02097268.inc
@@ -5,19 +5,19 @@
 .public Heap_Free
 .public GF_AssertFail
 .public SaveData_GetPhoneCallPersistentState
-.public sub_0202F01C
-.public sub_0202F050
+.public PhoneCallPersistentState_SetCallTriggerFlag
+.public PhoneCallPersistentState_ClearCallTriggerFlag
 .public PhoneCallPersistentState_SafariZoneArrangement_Set
 .public Save_SafariZone_Get
 .public SafariZone_GetAreaSet
-.public sub_0202F6A0
-.public sub_0202F6AC
-.public sub_0202F6B8
+.public SafariZone_SetLevel
+.public SafariZone_GetLevel
+.public SafariZone_AddToAllAreaLevels
 .public SafariZone_GetObjectUnlockLevel
 .public Save_VarsFlags_Get
 .public Save_VarsFlags_CheckSafariSysFlag
-.public sub_02097268
-.public sub_0209730C
-.public sub_020974C4
+.public GetSafariObjectConfig
+.public SaveData_SafariZone_CheckAreasWithUpdatedEncounters
+.public SafariZoneAreaSet_LoadAreaEncounters
 .public MI_CpuFill8
 .public _s32_div_f
diff --git a/asm/macros/script.inc b/asm/macros/script.inc
@@ -903,7 +903,7 @@
 	.byte \arg1
 	.endm
 
-	.macro scrcmd_149 arg0
+	.macro unset_phone_call_trigger arg0
 	.short 149
 	.byte \arg0
 	.endm

diff --git a/asm/overlay_01_021E6880.s b/asm/overlay_01_021E6880.s
@@ -7,6 +7,7 @@
 #include "constants/flags.h"
 #include "constants/mmodel.h"
 #include "constants/items.h"
+#include "constants/phone_constants.h"
 #include "msgdata/msg/msg_0096_D31R0201.h"
 #include "msgdata/msg/msg_0066_D23R0102.h"
 	.include "asm/macros.inc"
@@ -1138,7 +1139,7 @@ _021E7172:
 	cmp r0, #0
 	beq _021E718E
 	add r0, r4, #0
-	bl ov02_02246C8C
+	bl FieldSystem_PerformLandOrSurfEncounterCheck
 	cmp r0, #1
 	bne _021E718E
 	add sp, #8
@@ -2193,13 +2194,13 @@ ov01_021E7A08: ; 0x021E7A08
 	add r5, r0, #0
 	ldr r0, [r4, #0xc]
 	bl Save_VarsFlags_Get
-	ldr r1, _021E7A5C ; =FLAG_UNK_984
+	ldr r1, _021E7A5C ; =FLAG_SYS_GOT_BIKE_SHOP_CALL
 	bl Save_VarsFlags_CheckFlagInArray
 	cmp r0, #0
 	bne _021E7A56
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0202F08C
+	bl PhoneCallPersistentState_CheckCallTriggerFlag
 	cmp r0, #0
 	bne _021E7A56
 	ldr r0, [r4, #0xc]
@@ -2212,16 +2213,16 @@ ov01_021E7A08: ; 0x021E7A08
 	blo _021E7A56
 	add r0, r4, #0
 	bl FieldSystem_GetGearPhoneRingManager
-	mov r1, #2
-	mov r2, #1
+	mov r1, #CALL_TRIGGER_BIKE_SHOP_STEPS
+	mov r2, #1  // TRUE
 	bl sub_02092E14
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 _021E7A56:
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	nop
-_021E7A5C: .word FLAG_UNK_984
+_021E7A5C: .word FLAG_SYS_GOT_BIKE_SHOP_CALL
 	thumb_func_end ov01_021E7A08
 
 	thumb_func_start BugContestTimeoutCheck

diff --git a/asm/overlay_01_021F3610.s b/asm/overlay_01_021F3610.s
@@ -378,7 +378,7 @@ _021F38AC:
 	ldrb r1, [r4, #2]
 	ldr r2, [sp, #0x4c]
 	add r0, sp, #0x14
-	bl sub_02097268
+	bl GetSafariObjectConfig
 	add r1, sp, #0x14
 	ldrb r2, [r1]
 	ldr r0, [sp, #8]

diff --git a/asm/overlay_01_021FC05C.s b/asm/overlay_01_021FC05C.s
@@ -502,7 +502,7 @@ _021FC3A8:
 	bl GetMetatileBehavior
 	add r1, r0, #0
 	add r0, r5, #0
-	bl ov02_02247F9C
+	bl FieldSystem_CanGenerateStepEncounter
 	cmp r0, #0
 	beq _021FC3EE
 	mov r0, #6
@@ -552,7 +552,7 @@ _021FC434:
 _021FC444:
 	add r0, r5, #0
 	add r1, r6, #0
-	bl ov02_02247170
+	bl FieldSystem_PerformSweetScentEncounterCheck
 	cmp r0, #0
 	bne _021FC4B2
 	bl GF_AssertFail

diff --git a/asm/overlay_01_021FC66C.s b/asm/overlay_01_021FC66C.s
@@ -63,7 +63,7 @@ _021FC6B6:
 	ldr r1, [r5, #0xc]
 	add r0, r4, #0
 	add r2, #0x10
-	bl ov02_02246F70
+	bl FieldSystem_PerformFishEncounterCheck
 	str r0, [r5, #8]
 	ldr r1, [r5, #0xc]
 	ldr r2, [r5, #8]