diff --git a/heartgoldus.xMAP b/heartgoldus.xMAP
index f590f58cee..e3fdc76591 100644
--- a/heartgoldus.xMAP
+++ b/heartgoldus.xMAP
@@ -3266,9 +3266,9 @@
                                                                           73](ShouldUseAlternateLakeOfRage,func) found in global map_matrix.o
                                                                            74](sub_02066C4C,func) found in global sys_vars.o
                                                                            74](sub_02066C1C,func) found in global sys_vars.o
-                                                                          73](Fsys_GetWeather_HandleDiamondDust,func) found in global diamond_dust.o
+                                                                          73](FieldSystem_GetWeather_HandleDiamondDust,func) found in global field_system_rtc_weather.o
                                                                            74](MapHeader_GetWeatherType,func) found in global map_header.o
-                                                                           74](DiamondDustDates,object) found in global diamond_dust.o
+                                                                           74](DiamondDustDates,object) found in global field_system_rtc_weather.o
                                                                           73](SysFlagDefogCheck,func) found in global sys_flags.o
                                                                           73](SysFlagFlashCheck,func) found in global sys_flags.o
                                                                           73](LocalFieldData_SetWeatherType,func) found in global save_local_field_data.o
@@ -21989,9 +21989,9 @@
   0203BB88 00000000 .text   $b	(unk_0203BA5C.o)
   0203BB9C 00000000 .text   $b	(unk_0203BA5C.o)
   0203BBB0 00000000 .text   $d	(unk_0203BA5C.o)
-  0203BBB4 00000000 .text   $t	(diamond_dust.o)
-  0203BBB4 0000005C .text   Fsys_GetWeather_HandleDiamondDust	(diamond_dust.o)
-  0203BC08 00000000 .text   $d	(diamond_dust.o)
+  0203BBB4 00000000 .text   $t	(field_system_rtc_weather.o)
+  0203BBB4 0000005C .text   FieldSystem_GetWeather_HandleDiamondDust	(field_system_rtc_weather.o)
+  0203BC08 00000000 .text   $d	(field_system_rtc_weather.o)
   0203BC10 00000000 .text   $t	(unk_0203BC10.o)
   0203BC10 00001F5C .text   .text	(unk_0203BC10.o)
   0203BC10 00000018 .text   sub_0203BC10	(unk_0203BC10.o)
@@ -51755,8 +51755,8 @@
   020F6BAC 00000032 .rodata sPokemonCenterMaps	(map_header.o)
   020F6BE0 000032A0 .rodata sMapHeaders	(map_header.o)
   020F9E80 0000021C .rodata .rodata	(unk_0203BA5C.o)
-  020FA09C 00000010 .rodata DiamondDustDates	(diamond_dust.o)
-  020FA09C 00000000 .rodata .rodata	(diamond_dust.o)
+  020FA09C 00000010 .rodata DiamondDustDates	(field_system_rtc_weather.o)
+  020FA09C 00000000 .rodata .rodata	(field_system_rtc_weather.o)
   020FA0AC 000000B0 .rodata .rodata	(unk_0203BC10.o)
   020FA0B0 00000000 .rodata _020FA0B0	(unk_0203BC10.o)
   020FA15C 00000010 .rodata gApplication_NewGameFieldsys	(field_system.o)
@@ -228919,5 +228919,5 @@
   00000000 00000000 00000620 check.ITCM
   00000000 00000000 00000880 check.DTCM
 
-# Link start time: Fri Jul 14 11:57:25 2023
-# Link end time: Fri Jul 14 11:57:28 2023
+# Link start time: Tue Jul 18 03:27:25 2023
+# Link end time: Tue Jul 18 03:27:29 2023
diff --git a/soulsilverus.xMAP b/soulsilverus.xMAP
index ab75d15336..bc856c6706 100644
--- a/soulsilverus.xMAP
+++ b/soulsilverus.xMAP
@@ -3266,9 +3266,9 @@
                                                                           73](ShouldUseAlternateLakeOfRage,func) found in global map_matrix.o
                                                                            74](sub_02066C4C,func) found in global sys_vars.o
                                                                            74](sub_02066C1C,func) found in global sys_vars.o
-                                                                          73](Fsys_GetWeather_HandleDiamondDust,func) found in global diamond_dust.o
+                                                                          73](FieldSystem_GetWeather_HandleDiamondDust,func) found in global field_system_rtc_weather.o
                                                                            74](MapHeader_GetWeatherType,func) found in global map_header.o
-                                                                           74](DiamondDustDates,object) found in global diamond_dust.o
+                                                                           74](DiamondDustDates,object) found in global field_system_rtc_weather.o
                                                                           73](SysFlagDefogCheck,func) found in global sys_flags.o
                                                                           73](SysFlagFlashCheck,func) found in global sys_flags.o
                                                                           73](LocalFieldData_SetWeatherType,func) found in global save_local_field_data.o
@@ -21989,9 +21989,9 @@
   0203BB88 00000000 .text   $b	(unk_0203BA5C.o)
   0203BB9C 00000000 .text   $b	(unk_0203BA5C.o)
   0203BBB0 00000000 .text   $d	(unk_0203BA5C.o)
-  0203BBB4 00000000 .text   $t	(diamond_dust.o)
-  0203BBB4 0000005C .text   Fsys_GetWeather_HandleDiamondDust	(diamond_dust.o)
-  0203BC08 00000000 .text   $d	(diamond_dust.o)
+  0203BBB4 00000000 .text   $t	(field_system_rtc_weather.o)
+  0203BBB4 0000005C .text   FieldSystem_GetWeather_HandleDiamondDust	(field_system_rtc_weather.o)
+  0203BC08 00000000 .text   $d	(field_system_rtc_weather.o)
   0203BC10 00000000 .text   $t	(unk_0203BC10.o)
   0203BC10 00001F5C .text   .text	(unk_0203BC10.o)
   0203BC10 00000018 .text   sub_0203BC10	(unk_0203BC10.o)
@@ -51753,8 +51753,8 @@
   020F6BAC 00000032 .rodata sPokemonCenterMaps	(map_header.o)
   020F6BE0 000032A0 .rodata sMapHeaders	(map_header.o)
   020F9E80 0000021C .rodata .rodata	(unk_0203BA5C.o)
-  020FA09C 00000010 .rodata DiamondDustDates	(diamond_dust.o)
-  020FA09C 00000000 .rodata .rodata	(diamond_dust.o)
+  020FA09C 00000010 .rodata DiamondDustDates	(field_system_rtc_weather.o)
+  020FA09C 00000000 .rodata .rodata	(field_system_rtc_weather.o)
   020FA0AC 000000B0 .rodata .rodata	(unk_0203BC10.o)
   020FA0B0 00000000 .rodata _020FA0B0	(unk_0203BC10.o)
   020FA15C 00000010 .rodata gApplication_NewGameFieldsys	(field_system.o)
@@ -228919,5 +228919,5 @@
   00000000 00000000 00000620 check.ITCM
   00000000 00000000 00000880 check.DTCM
 
-# Link start time: Fri Jul 14 12:00:26 2023
-# Link end time: Fri Jul 14 12:00:30 2023
+# Link start time: Tue Jul 18 03:30:24 2023
+# Link end time: Tue Jul 18 03:30:27 2023