Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sub_8123EB4

This commit is contained in:
PikalaxALT 2017-10-30 21:34:19 -04:00
parent f0c71c7e3f
commit 7b6792230a
4 changed files with 66 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
asm/region_map.s
View File

@ -5,66 +5,6 @@
.text
thumb_func_start sub_8123E9C
sub_8123E9C: @ 8123E9C
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
bl GetRegionMapSectionIdAt
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_8123E9C
thumb_func_start sub_8123EB4
sub_8123EB4: @ 8123EB4
push {lr}
lsls r0, 16
lsrs r3, r0, 16
movs r2, 0
ldr r1, =gUnknown_085A1B84
_08123EBE:
ldrh r0, [r1]
cmp r0, r3
bne _08123ED4
bl sub_8123F04
lsls r0, 16
lsrs r0, 16
b _08123F00
.pool
_08123ED4:
adds r1, 0x2
adds r2, 0x1
cmp r2, 0x2
bls _08123EBE
ldr r1, =gUnknown_085A1B24
ldrh r0, [r1]
cmp r0, 0xD5
beq _08123EFE
adds r2, r1, 0
_08123EE6:
ldrh r0, [r2]
cmp r0, r3
bne _08123EF4
ldrh r0, [r1, 0x2]
b _08123F00
.pool
_08123EF4:
adds r1, 0x4
adds r2, 0x4
ldrh r0, [r1]
cmp r0, 0xD5
bne _08123EE6
_08123EFE:
adds r0, r3, 0
_08123F00:
pop {r1}
bx r1
thumb_func_end sub_8123EB4
thumb_func_start sub_8123F04
sub_8123F04: @ 8123F04
push {lr}

17
include/region_map.h
View File

@ -224,7 +224,7 @@ enum {
struct RegionMap {
/*0x000*/ u16 mapSecId;
/*0x002*/ u8 unk_002;
/*0x002*/ u8 iconDrawType;
/*0x003*/ u8 unk_003;
/*0x004*/ u8 mapSecName[0x14];
/*0x018*/ u8 (*inputCallback)(void);
@ -287,16 +287,25 @@ enum
INPUT_EVENT_B_BUTTON,
};
enum {
MAPSECTYPE_NONE,
MAPSECTYPE_PLAIN,
MAPSECTYPE_CITY_CANFLY,
MAPSECTYPE_CITY_CANTFLY,
MAPSECTYPE_BATTLE_FRONTIER
};
// Exported RAM declarations
// Exported ROM declarations
void sub_8122CF8(struct RegionMap *regionMap, struct BgTemplate *template, bool8 zoomed);
bool8 sub_8122DB0(void);
void GetMapName(u8 *, u16, u16);
void InitRegionMap(struct RegionMap *regionMap, u8 argument);
void sub_8124288(u16 x, u16 y);
void CreateRegionMapCursor(u16 x, u16 y);
u8 sub_81230AC(void);
void FreeRegionMapIconResources(void);
u16 sub_8123E9C(u16 x, u16 y);
void GetMapName(u8 *, u16, u16);
void sub_8124288(u16 x, u16 y);
void CreateRegionMapCursor(u16 x, u16 y);
#endif //GUARD_REGION_MAP_H

2
src/field_region_map.c
View File

@ -181,7 +181,7 @@ void sub_8170290(void)
static void sub_8170428(void)
{
if (gUnknown_0203BCD0->regionMap.unk_002 != 0)
if (gUnknown_0203BCD0->regionMap.iconDrawType != 0)
{
FillWindowPixelBuffer(0, 0x11);
PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);

75
src/region_map.c
View File

@ -52,6 +52,7 @@ static void sub_81238AC(void);
static void sub_8123C00(void);
static u8 get_flagnr_blue_points(u16 mapSecId);
u16 sub_8123EB4(u16 mapSecId);
u16 sub_8123F04(void);
void sub_8123F30(u16 *x, u16 *y);
void sub_8123FB0(void);
bool32 sub_8123F74(u8 mapSecId);
@ -68,6 +69,8 @@ extern const u8 gUnknown_0859F77C[];
extern const u8 gUnknown_085A04E0[];
extern const u8 gUnknown_085A096C[];
extern const struct RegionMapLocation gRegionMapEntries[];
extern const u16 gUnknown_085A1B84[];
extern const u16 gUnknown_085A1B24[][2];
// .text
@ -151,7 +154,7 @@ bool8 sub_8122DB0(void)
gRegionMap->unk_074 = gRegionMap->cursorPosX;
gRegionMap->unk_076 = gRegionMap->cursorPosY;
gRegionMap->mapSecId = sub_8123EB4(gRegionMap->mapSecId);
gRegionMap->unk_002 = get_flagnr_blue_points(gRegionMap->mapSecId);
gRegionMap->iconDrawType = get_flagnr_blue_points(gRegionMap->mapSecId);
GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
break;
case 6:
@ -287,7 +290,7 @@ static u8 MoveRegionMapCursor_Full(void)
gRegionMap->cursorPosY --;
}
mapSecId = GetRegionMapSectionIdAt(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
if (mapSecId != gRegionMap->mapSecId)
{
gRegionMap->mapSecId = mapSecId;
@ -360,7 +363,7 @@ static u8 MoveRegionMapCursor_Zoomed(void)
gRegionMap->unk_064 = x;
gRegionMap->unk_066 = y;
mapSecId = GetRegionMapSectionIdAt(x, y);
gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
if (mapSecId != gRegionMap->mapSecId)
{
gRegionMap->mapSecId = mapSecId;
@ -771,44 +774,70 @@ static u8 get_flagnr_blue_points(u16 mapSecId)
switch (mapSecId)
{
case MAPSEC_NONE2:
return 0;
return MAPSECTYPE_NONE;
case MAPSEC_LITTLEROOT_TOWN:
return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_OLDALE_TOWN:
return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_DEWFORD_TOWN:
return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_LAVARIDGE_TOWN:
return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_FALLARBOR_TOWN:
return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_VERDANTURF_TOWN:
return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_PACIFIDLOG_TOWN:
return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? 2 : 3;
return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_PETALBURG_CITY:
return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_SLATEPORT_CITY:
return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_MAUVILLE_CITY:
return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_RUSTBORO_CITY:
return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_FORTREE_CITY:
return FlagGet(FLAG_VISITED_FORTREE_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_FORTREE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_LILYCOVE_CITY:
return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_MOSSDEEP_CITY:
return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_SOOTOPOLIS_CITY:
return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_EVER_GRANDE_CITY:
return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
case MAPSEC_BATTLE_FRONTIER:
return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? 4 : 0;
return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? MAPSECTYPE_BATTLE_FRONTIER : MAPSECTYPE_NONE;
case MAPSEC_SOUTHERN_ISLAND:
return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0;
return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? MAPSECTYPE_PLAIN : MAPSECTYPE_NONE;
default:
return 1;
return MAPSECTYPE_PLAIN;
}
}
u16 sub_8123E9C(u16 x, u16 y)
{
return GetRegionMapSectionIdAt(x, y);
}
u16 sub_8123EB4(u16 mapSecId)
{
u32 i;
for (i = 0; i < 3; i ++)
{
if (gUnknown_085A1B84[i] == mapSecId)
{
return sub_8123F04();
}
}
for (i = 0; gUnknown_085A1B24[i][0] != MAPSEC_NONE2; i ++)
{
if (gUnknown_085A1B24[i][0] == mapSecId)
{
return gUnknown_085A1B24[i][1];
}
}
return mapSecId;
}