ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

sRegionMap_MapSecAquaHideoutOld

Browse Source
This commit is contained in:
PikalaxALT 2017-11-01 22:12:18 -04:00
parent 4ff03f85a9
commit 2e0b1700f4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/region_map.s
View File

@ -4,8 +4,8 @@
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_085A1BCC:: @ 85A1BCC gUnknown_085A1BD0:: @ 85A1BCC
.incbin "baserom.gba", 0x5a1bcc, 0x34 .incbin "baserom.gba", 0x5a1bd0, 0x30
gUnknown_085A1C00:: @ 85A1C00 gUnknown_085A1C00:: @ 85A1C00
.incbin "baserom.gba", 0x5a1c00, 0x8 .incbin "baserom.gba", 0x5a1c00, 0x8

11
src/region_map.c
View File

@ -189,7 +189,10 @@ static const struct UCoords16 sTerraCaveLocationCoords[] = {
{0x18, 0x0a} {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 SpritePalette gUnknown_085A1C00;
extern const struct SpriteTemplate gUnknown_085A1C08; extern const struct SpriteTemplate gUnknown_085A1C08;
extern const struct OamData gUnknown_085A1C20; extern const struct OamData gUnknown_085A1C20;
@ -1009,11 +1012,11 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
static bool32 RegionMap_IsPlayerInCave(u8 mapSecId) 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; return TRUE;
} }