Merge branch 'master' of https://github.com/pret/pokeruby

`:Q
B
A
B:`
r
A
r

D
D
C
D
D
r

1 files changed, 19 insertions, 19 deletions

diff --git a/src/rom4.c b/src/rom4.c
index bfc8e0e44..f9006efba 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -60,23 +60,23 @@ struct UnkTVStruct
     u32 tv_field_4;
 };
 
-extern struct WarpData gUnknown_020297F0;
-extern struct WarpData gUnknown_020297F8;
-extern struct WarpData gUnknown_02029800;
-extern struct WarpData gUnknown_02029808;
-extern struct UnkPlayerStruct gUnknown_02029810;
-extern u16 gUnknown_02029814;
-extern bool8 gUnknown_02029816;
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
-
-extern u8 gUnknown_03000580[];
-extern u16 (*gUnknown_03000584)(u32);
-extern u8 gUnknown_03000588;
-
-extern u16 word_3004858;
-extern void (*gFieldCallback)(void);
-extern u8 gUnknown_03004860;
-extern u8 gFieldLinkPlayerCount;
+EWRAM_DATA struct WarpData gUnknown_020297F0 = {0};
+EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
+EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
+EWRAM_DATA u16 gUnknown_02029814 = 0;
+EWRAM_DATA bool8 gUnknown_02029816 = FALSE;
+EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
+
+static u8 gUnknown_03000580[4];
+static u16 (*gUnknown_03000584)(u32);
+static u8 gUnknown_03000588;
+
+u16 word_3004858;
+void (*gFieldCallback)(void);
+u8 gUnknown_03004860;
+u8 gFieldLinkPlayerCount;
 
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
@@ -993,12 +993,12 @@ bool8 is_light_level_8_or_9(u8 a1)
 
 u8 unref_sub_8054260(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->name;
+    return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_name(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->name;
+    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_battletype(void)