diff --git a/data/region_map.s b/data/region_map.s index fcc00263e..57bc15b08 100644 --- a/data/region_map.s +++ b/data/region_map.s @@ -4,8 +4,8 @@ .section .rodata .align 2, 0 -gUnknown_085A1BCC:: @ 85A1BCC - .incbin "baserom.gba", 0x5a1bcc, 0x34 +gUnknown_085A1BD0:: @ 85A1BCC + .incbin "baserom.gba", 0x5a1bd0, 0x30 gUnknown_085A1C00:: @ 85A1C00 .incbin "baserom.gba", 0x5a1c00, 0x8 diff --git a/src/region_map.c b/src/region_map.c index 9fbb8cc47..195694988 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -189,7 +189,10 @@ static const struct UCoords16 sTerraCaveLocationCoords[] = { {0x18, 0x0a} }; -extern const u8 gUnknown_085A1BCC[]; +static const u8 sRegionMap_MapSecAquaHideoutOld[] = { + MAPSEC_AQUA_HIDEOUT_OLD +}; + extern const struct SpritePalette gUnknown_085A1C00; extern const struct SpriteTemplate gUnknown_085A1C08; extern const struct OamData gUnknown_085A1C20; @@ -1009,11 +1012,11 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y) static bool32 RegionMap_IsPlayerInCave(u8 mapSecId) { - int i; + u32 i; - for (i = 0; i == 0; i ++) + for (i = 0; i < 1; i ++) { - if (gUnknown_085A1BCC[i] == mapSecId) + if (sRegionMap_MapSecAquaHideoutOld[i] == mapSecId) { return TRUE; }