diff --git a/platinumus.xMAP b/platinumus.xMAP
index 8ead929f01..0206421be1 100644
--- a/platinumus.xMAP
+++ b/platinumus.xMAP
@@ -37310,17 +37310,17 @@
                        22](HandleFloatingPlatformJumpPointAt,func) found in local src_overlay009_ov9_02249960.c.o
                         23](FindFloatingPlatformJumpPointAt,func) found in local src_overlay009_ov9_02249960.c.o
                       21](ov5_021DFF1C,func) found in local src_overlay005_ov5_021DFB54.c.o
-                       22](ov9_0224F240,func) found in global src_overlay009_ov9_02249960.c.o
-                        23](ov9_0224F1F8,func) found in local src_overlay009_ov9_02249960.c.o
+                       22](DistWorld_WillBoulderBeAtFallLocation,func) found in global src_overlay009_ov9_02249960.c.o
+                        23](FindBoulderFallLocationFlag,func) found in local src_overlay009_ov9_02249960.c.o
                        22](ov5_021DFF88,func) found in local src_overlay005_ov5_021DFB54.c.o
                         23](ov5_021DFFBC,func) found in local src_overlay005_ov5_021DFB54.c.o
-                         24](ov9_0224F2B0,func) found in global src_overlay009_ov9_02249960.c.o
-                          25](ov9_0224F284,func) found in local src_overlay009_ov9_02249960.c.o
-                         24](ov9_0224F2BC,func) found in global src_overlay009_ov9_02249960.c.o
-                         24](ov9_0224F6EC,func) found in global src_overlay009_ov9_02249960.c.o
-                          25](ov9_0224F324,func) found in local src_overlay009_ov9_02249960.c.o
-                          25](ov9_0224F3BC,func) found in local src_overlay009_ov9_02249960.c.o
-                          25](ov9_0224F5D8,func) found in local src_overlay009_ov9_02249960.c.o
+                         24](DistWorld_IsBoulderAtFallLocation,func) found in global src_overlay009_ov9_02249960.c.o
+                          25](FindMapObjectBoulderFallLocationFlag,func) found in local src_overlay009_ov9_02249960.c.o
+                         24](DistWorldFallingBoulder_New,func) found in global src_overlay009_ov9_02249960.c.o
+                         24](DistWorldFallingBoulder_Tick,func) found in global src_overlay009_ov9_02249960.c.o
+                          25](DistWorldFallingBoulder_TickToB6F,func) found in local src_overlay009_ov9_02249960.c.o
+                          25](DistWorldFallingBoulder_TickToCorrectPit,func) found in local src_overlay009_ov9_02249960.c.o
+                          25](DistWorldFallingBoulder_TickToWrongPit,func) found in local src_overlay009_ov9_02249960.c.o
                       21](ov5_021E04A8,func) found in local src_overlay005_ov5_021DFB54.c.o
                        22](ov5_021E097C,func) found in global src_overlay005_ov5_021DFB54.c.o
                       21](ov5_021E032C,func) found in local src_overlay005_ov5_021DFB54.c.o
@@ -81748,25 +81748,25 @@
   0224F1CC 0000002C .text   IsMapObjectManaged	(src_overlay009_ov9_02249960.c.o)
   0224F1F4 00000000 .text   $d	(src_overlay009_ov9_02249960.c.o)
   0224F1F8 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F1F8 00000048 .text   ov9_0224F1F8	(src_overlay009_ov9_02249960.c.o)
+  0224F1F8 00000048 .text   FindBoulderFallLocationFlag	(src_overlay009_ov9_02249960.c.o)
   0224F238 00000000 .text   $d	(src_overlay009_ov9_02249960.c.o)
-  0224F240 00000042 .text   ov9_0224F240	(src_overlay009_ov9_02249960.c.o)
+  0224F240 00000042 .text   DistWorld_WillBoulderBeAtFallLocation	(src_overlay009_ov9_02249960.c.o)
   0224F240 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F284 0000002A .text   ov9_0224F284	(src_overlay009_ov9_02249960.c.o)
+  0224F284 0000002A .text   FindMapObjectBoulderFallLocationFlag	(src_overlay009_ov9_02249960.c.o)
   0224F284 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F2B0 0000000A .text   ov9_0224F2B0	(src_overlay009_ov9_02249960.c.o)
+  0224F2B0 0000000A .text   DistWorld_IsBoulderAtFallLocation	(src_overlay009_ov9_02249960.c.o)
   0224F2B0 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F2BC 00000068 .text   ov9_0224F2BC	(src_overlay009_ov9_02249960.c.o)
+  0224F2BC 00000068 .text   DistWorldFallingBoulder_New	(src_overlay009_ov9_02249960.c.o)
   0224F2BC 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
   0224F324 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F324 00000098 .text   ov9_0224F324	(src_overlay009_ov9_02249960.c.o)
+  0224F324 00000098 .text   DistWorldFallingBoulder_TickToB6F	(src_overlay009_ov9_02249960.c.o)
   0224F3B8 00000000 .text   $d	(src_overlay009_ov9_02249960.c.o)
   0224F3BC 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F3BC 0000021C .text   ov9_0224F3BC	(src_overlay009_ov9_02249960.c.o)
+  0224F3BC 0000021C .text   DistWorldFallingBoulder_TickToCorrectPit	(src_overlay009_ov9_02249960.c.o)
   0224F5D4 00000000 .text   $d	(src_overlay009_ov9_02249960.c.o)
-  0224F5D8 00000114 .text   ov9_0224F5D8	(src_overlay009_ov9_02249960.c.o)
+  0224F5D8 00000114 .text   DistWorldFallingBoulder_TickToWrongPit	(src_overlay009_ov9_02249960.c.o)
   0224F5D8 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
-  0224F6EC 00000038 .text   ov9_0224F6EC	(src_overlay009_ov9_02249960.c.o)
+  0224F6EC 00000038 .text   DistWorldFallingBoulder_Tick	(src_overlay009_ov9_02249960.c.o)
   0224F6EC 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
   0224F724 00000000 .text   $t	(src_overlay009_ov9_02249960.c.o)
   0224F724 0000003C .text   InitSkyBackgroundDarkness	(src_overlay009_ov9_02249960.c.o)
@@ -81979,7 +81979,7 @@
   02251288 00000008 .rodata sMapEventCmdParamsB2F_P13W_2	(src_overlay009_ov9_02249960.c.o)
   02251290 00000008 .rodata sMapEventCmdParamsB2F_P16E_2	(src_overlay009_ov9_02249960.c.o)
   02251298 00000008 .rodata sMapEventCmdParamsB2F_P15E_2	(src_overlay009_ov9_02249960.c.o)
-  022512A0 00000008 .rodata @22662	(src_overlay009_ov9_02249960.c.o)
+  022512A0 00000008 .rodata @22656	(src_overlay009_ov9_02249960.c.o)
   022512A8 00000008 .rodata sMapEventCmdParamsB2F_P17E_2	(src_overlay009_ov9_02249960.c.o)
   022512B0 00000008 .rodata sMapEventCmdParamsB2F_P3S_2	(src_overlay009_ov9_02249960.c.o)
   022512B8 00000008 .rodata sMapEventCmdParamsB2F_P11W_2	(src_overlay009_ov9_02249960.c.o)
@@ -82007,7 +82007,7 @@
   0225136C 0000000C .rodata sCyrusB4FMiddleAnimCmds	(src_overlay009_ov9_02249960.c.o)
   02251378 0000000C .rodata sCyrusB4FLeftmostAnimCmds	(src_overlay009_ov9_02249960.c.o)
   02251384 0000000C .rodata sCyrusB4FAnimCmds	(src_overlay009_ov9_02249960.c.o)
-  02251390 0000000C .rodata @22766	(src_overlay009_ov9_02249960.c.o)
+  02251390 0000000C .rodata @22760	(src_overlay009_ov9_02249960.c.o)
   0225139C 0000000C .rodata sHideGiratinaRoomPlatformsHandlers	(src_overlay009_ov9_02249960.c.o)
   022513A8 00000010 .rodata @19300	(src_overlay009_ov9_02249960.c.o)
   022513B8 00000010 .rodata sMapEventB5F_AzelfTuto	(src_overlay009_ov9_02249960.c.o)
@@ -82164,7 +82164,7 @@
   02252244 00000020 .rodata sMapEventB2F_P11E	(src_overlay009_ov9_02249960.c.o)
   02252264 00000020 .rodata sMapEventB2F_P12W	(src_overlay009_ov9_02249960.c.o)
   02252284 00000020 .rodata sGiratinaSpriteBasePalette	(src_overlay009_ov9_02249960.c.o)
-  022522A4 00000020 .rodata @22960	(src_overlay009_ov9_02249960.c.o)
+  022522A4 00000020 .rodata @22954	(src_overlay009_ov9_02249960.c.o)
   022522C4 00000020 .rodata sMapEventGiratinaRoom_FirstShadow	(src_overlay009_ov9_02249960.c.o)
   022522E4 00000020 .rodata sMapEventB2F_P12S	(src_overlay009_ov9_02249960.c.o)
   02252304 00000020 .rodata sMapEventB2F_P13N	(src_overlay009_ov9_02249960.c.o)
@@ -82242,7 +82242,7 @@
   02252FD0 00000064 .rodata sProp3DModelNARCIndexByKind	(src_overlay009_ov9_02249960.c.o)
   02253034 00000070 .rodata sMapEventsB5F	(src_overlay009_ov9_02249960.c.o)
   022530A4 00000078 .rodata sDistWorldMapConnectionList	(src_overlay009_ov9_02249960.c.o)
-  0225311C 000000B4 .rodata Unk_ov9_0225311C	(src_overlay009_ov9_02249960.c.o)
+  0225311C 000000B4 .rodata sBoulderFallLocations	(src_overlay009_ov9_02249960.c.o)
   022531D0 000000C8 .rodata sPropAnimInfoByKind	(src_overlay009_ov9_02249960.c.o)
   02253298 0000012C .rodata sPropInitialPosOffsetByKind	(src_overlay009_ov9_02249960.c.o)
   022533C4 0000012C .rodata sPropScaleByKind	(src_overlay009_ov9_02249960.c.o)