dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync map macro change with pokeemerald

Browse Source
This commit is contained in:
GriffinR
2024-08-27 13:57:07 -04:00
parent f155bf5419
commit 5e464c2091
32 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/seagallop.c
+13 -13
View File
@@ -61,17 +61,17 @@ static const struct BgTemplate sBGTemplates[] = {
static const s8 sSeag[][4] = {
// Map X Y
[SEAGALLOP_VERMILION_CITY] = {MAP(VERMILION_CITY), 0x17, 0x20},
[SEAGALLOP_ONE_ISLAND] = {MAP(ONE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_TWO_ISLAND] = {MAP(TWO_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_THREE_ISLAND] = {MAP(THREE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_FOUR_ISLAND] = {MAP(FOUR_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_FIVE_ISLAND] = {MAP(FIVE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_SIX_ISLAND] = {MAP(SIX_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_SEVEN_ISLAND] = {MAP(SEVEN_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_CINNABAR_ISLAND] = {MAP(CINNABAR_ISLAND), 0x15, 0x07},
[SEAGALLOP_NAVEL_ROCK] = {MAP(NAVEL_ROCK_HARBOR), 0x08, 0x05},
[SEAGALLOP_BIRTH_ISLAND] = {MAP(BIRTH_ISLAND_HARBOR), 0x08, 0x05}
[SEAGALLOP_VERMILION_CITY] = {MAP(MAP_VERMILION_CITY), 0x17, 0x20},
[SEAGALLOP_ONE_ISLAND] = {MAP(MAP_ONE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_TWO_ISLAND] = {MAP(MAP_TWO_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_THREE_ISLAND] = {MAP(MAP_THREE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_FOUR_ISLAND] = {MAP(MAP_FOUR_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_FIVE_ISLAND] = {MAP(MAP_FIVE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_SIX_ISLAND] = {MAP(MAP_SIX_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_SEVEN_ISLAND] = {MAP(MAP_SEVEN_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_CINNABAR_ISLAND] = {MAP(MAP_CINNABAR_ISLAND), 0x15, 0x07},
[SEAGALLOP_NAVEL_ROCK] = {MAP(MAP_NAVEL_ROCK_HARBOR), 0x08, 0x05},
[SEAGALLOP_BIRTH_ISLAND] = {MAP(MAP_BIRTH_ISLAND_HARBOR), 0x08, 0x05}
};
// Bitpacked array. In the commented section, right-most bit is the
@@ -495,8 +495,8 @@ u8 GetSeagallopNumber(void)
bool8 IsPlayerLeftOfVermilionSailor(void)
{
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY)
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VERMILION_CITY)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VERMILION_CITY)
&& gSaveBlock1Ptr->pos.x < 24)
return TRUE;