[Pokeemerald] Ghoul's Expansion Branch

[ghoulslash]

Hello everyone,

I've recently gotten tired of syncing so many branches, so I figured it can't be fun for newer hackers interested in decomps, either. I figured combining a bunch of my popular branches into one might be a good way to soften the barrier to entry for decompers.

So I present a new branch, ghoul_expansion. It includes:

• auto_run
• bag_sort
• custom_givemon
• dexnav
• follow_me
• overworld-expansion
• quest_menu
• saveblock
• sideways_stairs

Some GIFs of the above branches:

Spoiler:

To get it:

• git remote add ghoul https://github.com/ghoulslash/pokeemerald
• git pull ghoul ghoul_expansion

 

[SmokingArmy]

you truly are the G.O.A.T

 

[Primordial]

Hi mate, just stating to learn decomps after messing around with rom hacking. I feel like I'm kinda just grinding my head against a wall trying to get this working with dizzy egg's stuff. Is there any advice you can give on resolving conflicts there?

I've seen general advice that's just remove everything from the head but in some cases the incoming code doesn't look like it should go where it's going or functions that apparently conflict but don't seem to at all. I feel like I've tried it every way and still can't get it to compile :(

[EDIT]

I've just attempted to merge the two again together and recorded all of the conflicts that occurred as well as my though process behind them. A lot of it seems rather obvious and I think I'm really close but something is still not right.

I've tried to format this all as nicely as possible but it has been a very long time since using a forum activly so forgive me if there's some formatting erros or walls of text 😅

in src/battle_ai_switch_items.c - Removing head makes sense here to me

Spoiler:

line 834
<<<<<<< HEAD
        if (item == ITEM_ENIGMA_BERRY_E_READER)
=======
        if (item == ITEM_ENIGMA_BERRY)
            #ifndef FREE_ENIGMA_BERRY
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

in src/battle_main.c -This I don't entirely understand, should I keep the all the code or just remove the head? I'm going to keep both as it doesn't seem like it'd hurt.

Spoiler:

static void FreeResetData_ReturnToOvOrDoEvolutions(void)
{
    if (!gPaletteFade.active)
    {
<<<<<<< HEAD
        gIsFishingEncounter = FALSE;
        gIsSurfingEncounter = FALSE;
=======
        if (gDexnavBattle && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
            IncrementDexNavChain();
        else
            gSaveBlock1Ptr->dexNavChain = 0;
        
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        ResetSpriteData();
        if (gLeveledUpInBattle && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
        {
            gBattleMainFunc = TryEvolvePokemon;
        }
        else
        {
            gBattleMainFunc = ReturnFromBattleToOverworld;
            return;
        }
    }

in src/battle_scrip_commands - Removing head

Spoiler:

<<<<<<< HEAD
                if (item == ITEM_ENIGMA_BERRY_E_READER)
=======
                if (item == ITEM_ENIGMA_BERRY)
                    #ifndef FREE_ENIGMA_BERRY
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

in src/berry.c - removing head as well, from what I understand we're removing all the references to the e-reader berry and replacing them with another to free save data?

Spoiler:

<<<<<<< HEAD
    if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY_E_READER) && IsEnigmaBerryValid())
=======
    if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
        #ifndef FREE_ENIGMA_BERRY
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

in src/data/items.h - there are lots of key items here that are being added over items from dizzyegg's item expansion, these key items are defined later on in the file so I'll be removing
them from the incomming code. I'll still spoiler each one here just incase something is wrong.

Spoiler:

    [ITEM_FIST_PLATE] =
    {
<<<<<<< HEAD
        .name = _("Fist Plate"),
        .itemId = ITEM_FIST_PLATE,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_PLATE,
        .holdEffectParam = 20,
        .description = sFistPlateDesc,
        .pocket = POCKET_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
        .secondaryId = TYPE_FIGHTING,
=======
        .name = _("MACH BIKE"),
        .itemId = ITEM_MACH_BIKE,
        .price = 0,
        .description = sMachBikeDesc,
        .importance = 1,
        .registrability = TRUE,
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_FIELD,
        .fieldUseFunc = ItemUseOutOfBattle_Bike,
        .secondaryId = MACH_BIKE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
    },
	
    [ITEM_EARTH_PLATE] =
    {
<<<<<<< HEAD
        .name = _("Earth Plate"),
        .itemId = ITEM_EARTH_PLATE,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_PLATE,
        .holdEffectParam = 20,
        .description = sEarthPlateDesc,
        .pocket = POCKET_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
        .secondaryId = TYPE_GROUND,
=======
        .name = _("ITEMFINDER"),
        .itemId = ITEM_ITEMFINDER,
        .price = 0,
        .description = sItemfinderDesc,
        .importance = 1,
        .registrability = TRUE,
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_FIELD,
        .fieldUseFunc = ItemUseOutOfBattle_Itemfinder,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
    },

    [ITEM_SHOCK_DRIVE] =
    {
        .name = _("Shock Drive"),
        .itemId = ITEM_SHOCK_DRIVE,
        .price = 0,
<<<<<<< HEAD
        .holdEffect = HOLD_EFFECT_DRIVE,
        .description = sShockDriveDesc,
        .pocket = POCKET_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
        .secondaryId = TYPE_ELECTRIC,
=======
        .description = sAcroBikeDesc,
        .importance = 1,
        .registrability = TRUE,
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_FIELD,
        .fieldUseFunc = ItemUseOutOfBattle_Bike,
        .secondaryId = ACRO_BIKE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
    },


    [ITEM_BURN_DRIVE] =
    {
        .name = _("Burn Drive"),
        .itemId = ITEM_BURN_DRIVE,
        .price = 0,
<<<<<<< HEAD
        .holdEffect = HOLD_EFFECT_DRIVE,
        .description = sBurnDriveDesc,
        .pocket = POCKET_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
        .secondaryId = TYPE_FIRE,
=======
        .description = sPokeblockCaseDesc,
        .importance = 1,
        .registrability = TRUE,
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_PBLOCK_CASE,
        .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
    },

Now there are lots of 'conflicts' with nothing in the head, I'm just removing all the lines git has added here as it isn't a conflict.

Spoiler:

    [ITEM_KEY_TO_ROOM_4] =
    {
        .name = _("Key to Room 4"),
        .itemId = ITEM_KEY_TO_ROOM_4,
        .price = 0,
        .description = sKeyToRoom4Desc,
        .importance = 1,
<<<<<<< HEAD
=======
        .registrability = TRUE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
    },

    [ITEM_KEY_TO_ROOM_6] =
    {
        .name = _("Key to Room 6"),
        .itemId = ITEM_KEY_TO_ROOM_6,
        .price = 0,
        .description = sKeyToRoom6Desc,
        .importance = 1,
<<<<<<< HEAD
=======
        .registrability = TRUE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
    },
	
    [ITEM_METEORITE] =
    {
        .name = _("Meteorite"),
        .itemId = ITEM_METEORITE,
        .price = 0,
        .description = sMeteoriteDesc,
        .importance = 1,
<<<<<<< HEAD
=======
        .registrability = TRUE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
    },
	
	
    [ITEM_CONTEST_PASS] =
    {
        .name = _("Contest Pass"),
        .itemId = ITEM_CONTEST_PASS,
        .price = 0,
        .description = sContestPassDesc,
        .importance = 1,
<<<<<<< HEAD
=======
        .registrability = TRUE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
    },

A little different here, just removing incomming code as it refers to the berry pouch instead. Secret key, bike voucher, gold teeth, card key, lift key, silph scope then also have conflicts with nothing in their heads so git lines just get removed.

Spoiler:

    [ITEM_OAKS_PARCEL] =
    {
        .name = _("Oak's Parcel"),
        .itemId = ITEM_OAKS_PARCEL,
        .price = 0,
<<<<<<< HEAD
        .description = sOaksParcelDesc,
        .importance = 2,
=======
        .description = sBerryPouchDesc,
        .importance = 1,
        .registrability = TRUE,
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        .pocket = POCKET_KEY_ITEMS,
        .type = ITEM_USE_BAG_MENU,
        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
    },
[/SPOILER]

in src/data/pokemon/level_up_learnets.h
Lapras learn set is being changed here for some reason to what looks like gen3 without hydropump/sheer cold but with HM's instead. I'm removing incomming code as
we already have dizzy egg's updated data. Not sure why safeguard is commented out as well?

Spoiler:

static const struct LevelUpMove sLaprasLevelUpLearnset[] = {
    LEVEL_UP_MOVE( 1, MOVE_SING),
<<<<<<< HEAD
    LEVEL_UP_MOVE( 1, MOVE_GROWL),
    LEVEL_UP_MOVE( 1, MOVE_WATER_GUN),
    LEVEL_UP_MOVE( 4, MOVE_MIST),
    LEVEL_UP_MOVE( 7, MOVE_CONFUSE_RAY),
    LEVEL_UP_MOVE(10, MOVE_ICE_SHARD),
    LEVEL_UP_MOVE(14, MOVE_WATER_PULSE),
    LEVEL_UP_MOVE(18, MOVE_BODY_SLAM),
    LEVEL_UP_MOVE(22, MOVE_RAIN_DANCE),
    LEVEL_UP_MOVE(27, MOVE_PERISH_SONG),
    LEVEL_UP_MOVE(32, MOVE_ICE_BEAM),
    LEVEL_UP_MOVE(37, MOVE_BRINE),
    LEVEL_UP_MOVE(43, MOVE_SAFEGUARD),
    LEVEL_UP_MOVE(47, MOVE_HYDRO_PUMP),
    LEVEL_UP_MOVE(50, MOVE_SHEER_COLD),
=======
    LEVEL_UP_MOVE( 7, MOVE_MIST),
    LEVEL_UP_MOVE(13, MOVE_BODY_SLAM),
    LEVEL_UP_MOVE(19, MOVE_CONFUSE_RAY),
    LEVEL_UP_MOVE(25, MOVE_PERISH_SONG),
    LEVEL_UP_MOVE(31, MOVE_ICE_BEAM),
    LEVEL_UP_MOVE(37, MOVE_RAIN_DANCE),
    //LEVEL_UP_MOVE(43, MOVE_SAFEGUARD),
    LEVEL_UP_MOVE(43, MOVE_SURF),
    LEVEL_UP_MOVE(44, MOVE_WATERFALL),
    LEVEL_UP_MOVE(45, MOVE_DIVE),
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
    LEVEL_UP_END
};

in src/new_game.c - Keeping both conflicts here, I'm assuming dizzyegg added items.h on this line and now we're trying to add map_groups.h as well.

Spoiler:

<<<<<<< HEAD
#include "constants/items.h"
=======
#include "constants/map_groups.h"
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

in src/party_menu.c - just cleaning up more old enigma berry ref's, keeping new code. There are about three conflicts like this here, I'll do the same for all.

Spoiler:

static bool8 IsHPRecoveryItem(u16 item)
{
    const u8 *effect;

<<<<<<< HEAD
    if (item == ITEM_ENIGMA_BERRY_E_READER)
=======
    if (item == ITEM_ENIGMA_BERRY)
        #ifndef FREE_ENIGMA_BERRY
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        effect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
        #else
        effect = 0;
        #endif
    else
        effect = gItemEffectTable[item - ITEM_POTION];

    if (effect[4] & ITEM4_HEAL_HP)
        return TRUE;
    else
        return FALSE;
}[/SPOILER]

in src/pokedex.c - I'm a bit lost here, have we redefined dexCaught & dexSeen into pokedex.owned & pokedex.seen? I'm going to keep both but maybe should I be removing old code?

Spoiler:

void ResetPokedex(void)
{
    u16 i;

    sLastSelectedPokemon = 0;
    sPokeBallRotation = POKEBALL_ROTATION_TOP;
    gUnusedPokedexU8 = 0;
    gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN;
    gSaveBlock2Ptr->pokedex.order = 0;
    gSaveBlock2Ptr->pokedex.nationalMagic = 0;
    gSaveBlock2Ptr->pokedex.unknown2 = 0;
    gSaveBlock2Ptr->pokedex.unownPersonality = 0;
    gSaveBlock2Ptr->pokedex.spindaPersonality = 0;
    gSaveBlock2Ptr->pokedex.unknown3 = 0;
    DisableNationalPokedex();
    for (i = 0; i < DEX_FLAGS_NO; i++)
    {
<<<<<<< HEAD
        gSaveBlock1Ptr->dexCaught[i] = 0;
        gSaveBlock1Ptr->dexSeen[i] = 0;
=======
        gSaveBlock2Ptr->pokedex.owned[i] = 0;
        gSaveBlock2Ptr->pokedex.seen[i] = 0;
        #ifndef FREE_EXTRA_SEEN_FLAGS
        gSaveBlock1Ptr->seen1[i] = 0;
        gSaveBlock1Ptr->seen2[i] = 0;
        #endif
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
    }
}
[/SPOILER]

in src/pokedex.c - There's a lot of code here in this conflict, but the cases for the switch above are dealt with in the incomming code so removing the old code seems okay to me

Spoiler:

s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID)
{
    u32 index, bit, mask;
    s8 retVal = 0;

    nationalDexNo--;
    index = nationalDexNo / 8;
    bit = nationalDexNo % 8;
    mask = 1 << bit;

    switch (caseID)
    {
    case FLAG_GET_SEEN:
<<<<<<< HEAD
        retVal = ((gSaveBlock1Ptr->dexSeen[index] & mask) != 0);
        break;
    case FLAG_GET_CAUGHT:
         retVal = ((gSaveBlock1Ptr->dexCaught[index] & mask) != 0);
        break;
    case FLAG_SET_SEEN:
        gSaveBlock1Ptr->dexSeen[index] |= mask;
=======
        if (gSaveBlock2Ptr->pokedex.seen[index] & mask)
        {
            #ifndef FREE_EXTRA_SEEN_FLAGS
            if ((gSaveBlock2Ptr->pokedex.seen[index] & mask) == (gSaveBlock1Ptr->seen1[index] & mask)
             && (gSaveBlock2Ptr->pokedex.seen[index] & mask) == (gSaveBlock1Ptr->seen2[index] & mask))
                retVal = 1;
            else
            {
                gSaveBlock2Ptr->pokedex.seen[index] &= ~mask;
                gSaveBlock1Ptr->seen1[index] &= ~mask;
                gSaveBlock1Ptr->seen2[index] &= ~mask;
                retVal = 0;
            }
            #else
                retVal = 1;
            #endif
        }
        break;
    case FLAG_GET_CAUGHT:
        if (gSaveBlock2Ptr->pokedex.owned[index] & mask)
        {
            #ifndef FREE_EXTRA_SEEN_FLAGS
            if ((gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock2Ptr->pokedex.seen[index] & mask)
             && (gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock1Ptr->seen1[index] & mask)
             && (gSaveBlock2Ptr->pokedex.owned[index] & mask) == (gSaveBlock1Ptr->seen2[index] & mask))
                retVal = 1;
            else
            {
                gSaveBlock2Ptr->pokedex.owned[index] &= ~mask;
                gSaveBlock2Ptr->pokedex.seen[index] &= ~mask;
                gSaveBlock1Ptr->seen1[index] &= ~mask;
                gSaveBlock1Ptr->seen2[index] &= ~mask;
                retVal = 0;
            }
            #else
                retVal = 1;
            #endif
        }
        break;
    case FLAG_SET_SEEN:
        gSaveBlock2Ptr->pokedex.seen[index] |= mask;
        #ifndef FREE_EXTRA_SEEN_FLAGS
        gSaveBlock1Ptr->seen1[index] |= mask;
        gSaveBlock1Ptr->seen2[index] |= mask;
        #endif
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42
        break;
    case FLAG_SET_CAUGHT:
        gSaveBlock1Ptr->dexCaught[index] |= mask;
        break;
    }

    return retVal;
}

in src/pokemon.c - I'm refering to a post made earlier here, keep stuff with FlagGet(FLAG_SHINY_CREATION) only. So I'll be removing all the incoming gSaveBlock stuff that is repeated
above already and then carrying over the two if statements.

Spoiler:

void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
{
    u8 speciesName[POKEMON_NAME_LENGTH + 1];
    u32 personality;
    u32 value;
    u16 checksum;

    ZeroBoxMonData(boxMon);

    if (hasFixedPersonality)
        personality = fixedPersonality;
    else
        personality = Random32();

    // Determine original trainer ID
    if (otIdType == OT_ID_RANDOM_NO_SHINY) // Pokemon cannot be shiny
    {
        u32 shinyValue;
        do
        {
            // Choose random OT IDs until one that results in a non-shiny Pokémon
            value = Random32();
            shinyValue = GET_SHINY_VALUE(value, personality);
        } while (shinyValue < SHINY_ODDS);
    }
    else if (otIdType == OT_ID_PRESET)
    {
        value = fixedOtId;
    }
    else // Player is the OT
    {
        #ifdef ITEM_SHINY_CHARM
        u32 shinyRolls = (CheckBagHasItem(ITEM_SHINY_CHARM, 1)) ? 3 : 1;
        #else
        u32 shinyRolls = 1;
        #endif
        u32 i;
        
        value = gSaveBlock2Ptr->playerTrainerId[0]
<<<<<<< HEAD
              | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
              | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
              | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
        
        if (CheckBagHasItem(ITEM_SHINY_CHARM, 1))
        {
            u32 shinyValue;
            u32 rolls = 0;
            do
            {
                personality = Random32();
                shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality);
                rolls++;
            } while (shinyValue >= SHINY_ODDS && rolls < I_SHINY_CHARM_REROLLS);
        }
    }

=======
                  | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
                  | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
                  | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
                  
        for (i = 0; i < shinyRolls; i++)
        {
            if (Random() < SHINY_ODDS)
                FlagSet(FLAG_SHINY_CREATION);   // use a flag bc of CreateDexNavWildMon
        }

        if (FlagGet(FLAG_SHINY_CREATION))
        {
            u8 nature = personality % NUM_NATURES;  // keep current nature
            do {
                personality = Random32();
                personality = ((((Random() % SHINY_ODDS) ^ (HIHALF(value) ^ LOHALF(value))) ^ LOHALF(personality)) << 16) | LOHALF(personality);
            } while (nature != GetNatureFromPersonality(personality));
            
            // clear the flag after use
            FlagClear(FLAG_SHINY_CREATION);
        }
    }
    
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

in src/rom_header_gf.c - I've been keeping both bits of code that have related to pokedex so far but now this is giving me doubts that this is incorrect becuase of the duplicate refrences to
SaveBlock1. I'm going to keep both but I could see now how my problem could be from doing so.

Spoiler:

<<<<<<< HEAD
    u32 seenOffset;
=======
    #ifndef FREE_EXTRA_SEEN_FLAGS
    u32 seen1Offset;
    #endif
    u32 seen2Offset;
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

going to keep both bits of code here as they don't seem to conflict. 

<<<<<<< HEAD
    .seenOffset = offsetof(struct SaveBlock1, dexSeen),
=======
    #ifndef FREE_EXTRA_SEEN_FLAGS
    .seen1Offset = offsetof(struct SaveBlock1, seen1),
    #endif
>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

in src/wild_encounter.c - two functions that do not seem to conflict, keeping both.

Spoiler:

<<<<<<< HEAD
bool8 TryDoDoubleWildBattle(void)
{
    if (GetSafariZoneFlag() || GetMonsStateToDoubles() != PLAYER_HAS_TWO_USABLE_MONS)
        return FALSE;
    else if (B_FLAG_FORCE_DOUBLE_WILD != 0 && FlagGet(B_FLAG_FORCE_DOUBLE_WILD))
        return TRUE;
    #if B_DOUBLE_WILD_CHANCE != 0
    else if ((Random() % 100) + 1 < B_DOUBLE_WILD_CHANCE)
        return TRUE;
    #endif
    return FALSE;
}
=======
u8 ChooseHiddenMonIndex(void)
{
    #ifdef ENCOUNTER_CHANCE_HIDDEN_MONS_TOTAL
        u8 rand = Random() % ENCOUNTER_CHANCE_HIDDEN_MONS_TOTAL;

        if (rand < ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_0)
            return 0;
        else if (rand >= ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_0 && rand < ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_1)
            return 1;
        else
            return 2;
    #else
        return 0xFF;
    #endif
}

>>>>>>> f093d01dde9456f6e59371a98da836c9235dcb42

All of this have resulted in this after attempting to compile a rom, I know there's a lot to look over and I'm not expecting a response due to that, but there is very few guides on how to resolve these issues and I'd love to get to the point I have the experience to work on them myself.

Spoiler:

primordial@DESKTOP-BL88VIP:/mnt/c/Users/liamj/decomps/Eternal_Emerald$ make -j16
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/field_effect.o src/field_effect.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/battle_anim_water.o src/battle_anim_water.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/mon_markings.o src/mon_markings.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/librfu_stwi.o src/librfu_stwi.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/battle_anim_new.o src/battle_anim_new.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/event_data.o src/event_data.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/pokenav_ribbons_list.o src/pokenav_ribbons_list.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/battle_anim_dark.o src/battle_anim_dark.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/script.o src/script.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/mystery_gift_menu.o src/mystery_gift_menu.c
tools/agbcc/bin/agbcc <flags> -o build/emerald/src/pokeball.o src/pokeball.c
In file included from include/global.h:596,
from src/field_effect.c:1:
In file includedtools/agbcc/bin/agbcc <flags> -o build/emerald/src/mail_data.o src/mail_data.c
include/pokemon.h:463: tools/agbcc/bin/agbcc <flags> -o build/emerald/src/util.o src/util.c
from include/global.h:596syntax error before `<'tools/agbcc/bin/agbcc <flags> -o build/emerald/src/battle_tv.o src/battle_tv.c
,

In file includedIn file included from include/librfu.h:4include/pokemon.h:467: from include/global.h:596 from include/global.h:596,
syntax error before `==',
,
from src/librfu_stwi.c:1
from src/battle_anim_water.c:1 from src/mon_markings.c:1:
include/pokemon.h:470: :
:
include/pokemon.h:463: syntax error before `>'include/pokemon.h:463: include/pokemon.h:463: syntax error before `<'
syntax error before `<'syntax error before `<'
In file included

include/pokemon.h:467: from src/field_effect.c:1In file includedinclude/pokemon.h:467: include/pokemon.h:467: tools/agbcc/bin/agbcc <flags> -o build/emerald/src/egg_hatch.o src/egg_hatch.c
syntax error before `==':
from include/global.h:596syntax error before `=='syntax error before `=='
include/global.h:604: ,


include/pokemon.h:470: syntax error before `}' from src/event_data.c:1include/pokemon.h:470: include/pokemon.h:470: syntax error before `>'
:
syntax error before `>'syntax error before `>'
include/pokemon.h:463:

In file includedsyntax error before `<'In file includedinclude/global.h:989: In file included from include/librfu.h:4
from src/battle_anim_water.c:1tools/agbcc/bin/agbcc <flags> -o build/emerald/src/dewford_trend.o src/dewford_trend.c
field `location' has incomplete type from src/mon_markings.c:1,
include/pokemon.h:467: :

:
from src/librfu_stwi.c:1syntax error before `=='In file includedinclude/global.h:604: include/global.h:990: include/global.h:604: :

from include/global.h:596syntax error before `}'field `continueGameWarp' has incomplete typesyntax error before `}'include/global.h:604: include/pokemon.h:470: ,



syntax error before `}'syntax error before `>' from src/pokenav_ribbons_list.c:1include/global.h:989: include/global.h:991: In file included

:
field `location' has incomplete typefield `dynamicWarp' has incomplete type from include/global.h:596include/global.h:989: In file includedinclude/pokemon.h:463:

,
field `location' has incomplete type from src/event_data.c:1include/global.h:989: syntax error before `<'include/global.h:990: include/global.h:992: from src/battle_anim_new.c:1
:
field `location' has incomplete type
field `continueGameWarp' has incomplete typefield `lastHealLocation' has incomplete type:
include/global.h:990: include/global.h:604:
include/pokemon.h:467:

include/pokemon.h:463: field `continueGameWarp' has incomplete typesyntax error before `}'include/global.h:990: syntax error before `=='include/global.h:991: include/global.h:993: syntax error before `<'

field `continueGameWarp' has incomplete type
field `dynamicWarp' has incomplete typefield `escapeWarp' has incomplete type
include/global.h:991: In file includedinclude/global.h:989:

include/pokemon.h:470:
include/pokemon.h:467: field `dynamicWarp' has incomplete type from include/global.h:596field `location' has incomplete typeinclude/global.h:991: include/global.h:992: syntax error before `>'syntax error before `=='
,

field `dynamicWarp' has incomplete typeinclude/global.h:1068: field `lastHealLocation' has incomplete type

include/global.h:992: from src/script.c:1include/global.h:990:
syntax error before `<'
In file includedinclude/pokemon.h:470: field `lastHealLocation' has incomplete type:
field `continueGameWarp' has incomplete typeinclude/global.h:992:
include/global.h:993: from src/pokenav_ribbons_list.c:1syntax error before `>'
include/pokemon.h:463:
field `lastHealLocation' has incomplete typeagbcc: warnings being treated as errors
field `escapeWarp' has incomplete type:

include/global.h:993: syntax error before `<'include/global.h:991:
include/global.h:1068:
include/global.h:604: In file includedfield `escapeWarp' has incomplete type
field `dynamicWarp' has incomplete typeinclude/global.h:993: warning: syntax error before `}' from src/battle_anim_new.c:1

include/pokemon.h:467: field `escapeWarp' has incomplete typeno semicolon at end of struct or union
include/global.h:1068: :
include/global.h:992: syntax error before `=='

syntax error before `<'include/global.h:1068: include/global.h:604: field `lastHealLocation' has incomplete type

include/global.h:1082: syntax error before `<'syntax error before `}'
include/pokemon.h:470: agbcc: warnings being treated as errors
syntax error before `=='

include/global.h:993: syntax error before `>'include/global.h:1068: include/global.h:1068:
agbcc: warnings being treated as errors
field `escapeWarp' has incomplete type
syntax error before `<'warning: include/global.h:989: include/global.h:1114: include/global.h:1068:
In file included
no semicolon at end of struct or unionfield `location' has incomplete typesyntax error before `>'warning: from src/script.c:1agbcc: warnings being treated as errors


include/global.h:1068:
no semicolon at end of struct or union:
include/global.h:989: include/global.h:1082: include/global.h:990: include/global.h:1068: syntax error before `<'
include/global.h:604: field `location' has incomplete typesyntax error before `=='field `continueGameWarp' has incomplete typewarning:
include/global.h:1082: syntax error before `}'

In file included
no semicolon at end of struct or unionagbcc: warnings being treated as errors
syntax error before `=='
include/global.h:990: include/global.h:1114: from include/global.h:596include/global.h:991:
include/global.h:1068:
field `continueGameWarp' has incomplete typesyntax error before `>',
field `dynamicWarp' has incomplete typeinclude/global.h:1082: warning: include/global.h:1114: In file included

from src/util.c:1
syntax error before `=='no semicolon at end of struct or unioninclude/global.h:989: syntax error before `>' from include/global.h:596include/global.h:991: :
include/global.h:992:

field `location' has incomplete type
,
field `dynamicWarp' has incomplete typeinclude/pokemon.h:463: field `lastHealLocation' has incomplete typeinclude/global.h:1114: include/global.h:1082:
from src/mail_data.c:1
syntax error before `<'
syntax error before `>'syntax error before `=='include/global.h:990: :
In file includedinclude/global.h:992:
include/global.h:993:

field `continueGameWarp' has incomplete typeinclude/pokemon.h:463: from include/global.h:596field `lastHealLocation' has incomplete typeinclude/pokemon.h:467: field `escapeWarp' has incomplete type
include/global.h:1114: syntax error before `<',

syntax error before `=='
include/global.h:991: syntax error before `>'
from src/battle_anim_dark.c:1include/global.h:993:
field `dynamicWarp' has incomplete type
include/pokemon.h:467: :
field `escapeWarp' has incomplete typeinclude/global.h:1068: include/pokemon.h:470:
In file includedsyntax error before `=='include/pokemon.h:463:
syntax error before `<'syntax error before `>'include/global.h:992: from include/global.h:596
syntax error before `<'

src/event_data.c: field `lastHealLocation' has incomplete type,
include/pokemon.h:470:
agbcc: warnings being treated as errors
include/global.h:1068: In file includedIn function `InitEventData':

from src/mystery_gift_menu.c:1syntax error before `>'include/pokemon.h:467: include/global.h:1068: syntax error before `<' from src/util.c:1src/event_data.c:39: include/global.h:993: :

syntax error before `=='warning:
:
dereferencing pointer to incomplete typefield `escapeWarp' has incomplete typeinclude/pokemon.h:463: In file included
no semicolon at end of struct or unionagbcc: warnings being treated as errors
include/global.h:604:

syntax error before `<' from src/mail_data.c:1include/pokemon.h:470:
include/global.h:1068: syntax error before `}'src/event_data.c:39:
:
syntax error before `>'warning:
include/global.h:1082: dereferencing pointer to incomplete typeinclude/global.h:1068: include/pokemon.h:467: include/global.h:604:
no semicolon at end of struct or unionsyntax error before `=='
syntax error before `<'syntax error before `=='syntax error before `}'In file included

src/event_data.c:40:


from src/battle_anim_dark.c:1include/global.h:1082: dereferencing pointer to incomplete typeinclude/global.h:1114: agbcc: warnings being treated as errors
include/pokemon.h:470: :
syntax error before `=='
syntax error before `>'include/global.h:989: include/global.h:1068: syntax error before `>'include/global.h:604:
src/event_data.c:40:
include/global.h:989: field `location' has incomplete typewarning:
syntax error before `}'dereferencing pointer to incomplete typeinclude/global.h:1114: field `location' has incomplete type
no semicolon at end of struct or unionIn file included

syntax error before `>'
include/global.h:990:
from src/mystery_gift_menu.c:1
include/global.h:990: src/event_data.c: field `continueGameWarp' has incomplete typeinclude/global.h:989: include/global.h:1082: :
In file includedfield `continueGameWarp' has incomplete typeIn function `ClearTempFieldEventData':

field `location' has incomplete typesyntax error before `=='include/global.h:604: from include/global.h:596
src/event_data.c:46: include/global.h:991:

syntax error before `}',
include/global.h:991: dereferencing pointer to incomplete typefield `dynamicWarp' has incomplete typeinclude/global.h:990:
include/global.h:1114: from src/battle_tv.c:1field `dynamicWarp' has incomplete type

field `continueGameWarp' has incomplete typesyntax error before `>':

src/event_data.c:47: include/global.h:992:

include/pokemon.h:463: include/global.h:992: dereferencing pointer to incomplete typefield `lastHealLocation' has incomplete typeinclude/global.h:991: syntax error before `<'field `lastHealLocation' has incomplete type
include/global.h:989:
In file includedfield `dynamicWarp' has incomplete type

field `location' has incomplete typeinclude/global.h:993: src/event_data.c:
from include/global.h:596include/pokemon.h:467: include/global.h:993:
field `escapeWarp' has incomplete typeIn function `ClearDailyFlags':
include/global.h:992: ,
syntax error before `=='field `escapeWarp' has incomplete typeinclude/global.h:990:
src/event_data.c:57: field `lastHealLocation' has incomplete type from src/pokeball.c:1

field `continueGameWarp' has incomplete typedereferencing pointer to incomplete type
:
include/pokemon.h:470:

include/global.h:1068: include/global.h:993: include/pokemon.h:463: syntax error before `>'include/global.h:991: include/global.h:1068: syntax error before `<'field `escapeWarp' has incomplete typesyntax error before `<'
field `dynamicWarp' has incomplete typesyntax error before `<'


In file included

agbcc: warnings being treated as errors
include/pokemon.h:467: include/global.h:1068: from src/battle_tv.c:1include/global.h:992: agbcc: warnings being treated as errors
In file includedinclude/global.h:1068: syntax error before `=='syntax error before `<':
field `lastHealLocation' has incomplete typeinclude/global.h:1068: from include/global.h:596warning:

include/global.h:604:
warning: ,
src/event_data.c: no semicolon at end of struct or unioninclude/pokemon.h:470: agbcc: warnings being treated as errors
syntax error before `}'include/global.h:993: no semicolon at end of struct or union from src/dewford_trend.c:1In function `GetVarPointer':

syntax error before `>'include/global.h:1068:
field `escapeWarp' has incomplete type
:
src/event_data.c:174:
warning: include/global.h:1082:
include/pokemon.h:463: include/global.h:1082: dereferencing pointer to incomplete typeIn file includedno semicolon at end of struct or unionsyntax error before `=='syntax error before `<'syntax error before `=='
from src/pokeball.c:1



include/global.h:1068: :
include/global.h:1082: include/global.h:1114: include/pokemon.h:467: syntax error before `<'include/global.h:1114: include/global.h:604: syntax error before `=='syntax error before `>'syntax error before `=='include/global.h:989:
syntax error before `>'syntax error before `}'


field `location' has incomplete typeagbcc: warnings being treated as errors


include/global.h:1114: include/pokemon.h:470:
include/global.h:1068: syntax error before `>'syntax error before `>'include/global.h:990: warning:

field `continueGameWarp' has incomplete typeno semicolon at end of struct or unioninclude/global.h:989: In file includedsrc/event_data.c:

field `location' has incomplete type from src/dewford_trend.c:1In function `GetFlagPointer':
include/global.h:991: include/global.h:1082:
:
src/event_data.c:206: field `dynamicWarp' has incomplete typesyntax error before `=='include/global.h:990: include/global.h:604: dereferencing pointer to incomplete type

field `continueGameWarp' has incomplete typesrc/mail_data.c: syntax error before `}'
include/global.h:992:
include/global.h:1114: In function `ClearAllMail':

field `lastHealLocation' has incomplete typeinclude/global.h:991: syntax error before `>'src/mail_data.c:17:
field `dynamicWarp' has incomplete type
dereferencing pointer to incomplete typeinclude/global.h:993:

field `escapeWarp' has incomplete typeinclude/global.h:992: include/global.h:989:
src/mail_data.c: field `lastHealLocation' has incomplete typefield `location' has incomplete typeinclude/global.h:1068: In function `GiveMailToMonByItemId':

In file included
syntax error before `<'src/mail_data.c:58: include/global.h:993: from include/global.h:596include/global.h:990:
dereferencing pointer to incomplete typeMakefile:339: recipe for target 'build/emerald/src/script.o' failed
field `escapeWarp' has incomplete type,
field `continueGameWarp' has incomplete typeagbcc: warnings being treated as errors

make: *** [build/emerald/src/script.o] Error 1

from src/egg_hatch.c:1
include/global.h:1068: src/mail_data.c:61: make: *** Deleting file 'build/emerald/src/script.o'
:
include/global.h:991: include/global.h:1068: warning: dereferencing pointer to incomplete typeinclude/pokemon.h:463: field `dynamicWarp' has incomplete typesyntax error before `<'no semicolon at end of struct or union
syntax error before `<'


src/mail_data.c:64:
include/global.h:992: agbcc: warnings being treated as errors
dereferencing pointer to incomplete typeinclude/global.h:1082: field `lastHealLocation' has incomplete typeinclude/pokemon.h:467: include/global.h:1068:
syntax error before `=='
make: *** Waiting for unfinished jobs....
syntax error before `=='warning: src/mail_data.c:65:
include/global.h:993:
Makefile:339: recipe for target 'build/emerald/src/event_data.o' failed
no semicolon at end of struct or uniondereferencing pointer to incomplete typeinclude/global.h:1114: field `escapeWarp' has incomplete typeinclude/pokemon.h:470: make: *** [build/emerald/src/event_data.o] Error 1


syntax error before `>'
syntax error before `>'make: *** Deleting file 'build/emerald/src/event_data.o'
src/mail_data.c:66:
include/global.h:1082:
dereferencing pointer to incomplete typesyntax error before `=='include/global.h:1068: In file included

syntax error before `<' from src/egg_hatch.c:1src/mail_data.c:69: include/global.h:1114:
:
dereferencing pointer to incomplete typesyntax error before `>'agbcc: warnings being treated as errors
Makefile:339: recipe for target 'build/emerald/src/librfu_stwi.o' failed
include/global.h:604:

include/global.h:1068: make: *** [build/emerald/src/librfu_stwi.o] Error 1
syntax error before `}'src/mail_data.c:73: warning: make: *** Deleting file 'build/emerald/src/librfu_stwi.o'

dereferencing pointer to incomplete typeno semicolon at end of struct or union

src/mail_data.c:74: include/global.h:1082: dereferencing pointer to incomplete typesyntax error before `=='

include/global.h:1114: syntax error before `>'
include/global.h:989: field `location' has incomplete type
include/global.h:990: field `continueGameWarp' has incomplete type
include/global.h:991: field `dynamicWarp' has incomplete type
include/global.h:992: field `lastHealLocation' has incomplete type
include/global.h:993: field `escapeWarp' has incomplete type
include/global.h:1068: syntax error before `<'src/mail_data.c:
In function `GiveMailToMon':
src/dewford_trend.c: Makefile:339: recipe for target 'build/emerald/src/pokenav_ribbons_list.o' failed
agbcc: warnings being treated as errors
src/mail_data.c:121: In function `InitDewfordTrend':
make: *** [build/emerald/src/pokenav_ribbons_list.o] Error 1
include/global.h:1068: dereferencing pointer to incomplete typesrc/dewford_trend.c:78: warning:
make: *** Deleting file 'build/emerald/src/pokenav_ribbons_list.o'
dereferencing pointer to incomplete typeno semicolon at end of struct or union

src/dewford_trend.c:81: dereferencing pointer to incomplete typeinclude/global.h:1082:
syntax error before `=='src/dewford_trend.c:83:
dereferencing pointer to incomplete type
include/global.h:1114: src/dewford_trend.c:85: syntax error before `>'dereferencing pointer to incomplete typeMakefile:339: recipe for target 'build/emerald/src/util.o' failed


make: *** [build/emerald/src/util.o] Error 1
src/dewford_trend.c:86: src/mail_data.c: dereferencing pointer to incomplete typemake: *** Deleting file 'build/emerald/src/util.o'
In function `TakeMailFromMon':

src/mail_data.c:146: src/dewford_trend.c:88: dereferencing pointer to incomplete typedereferencing pointer to incomplete type

src/mail_data.c: In function `ClearMailItemId':
src/dewford_trend.c: src/mail_data.c:157: In function `UpdateDewfordTrendPerDay':
dereferencing pointer to incomplete typesrc/dewford_trend.c:103:
dereferencing pointer to incomplete type
src/mail_data.c: In function `TakeMailFromMonAndSave':
src/mail_data.c:172: dereferencing pointer to incomplete type
src/dewford_trend.c:144: src/mail_data.c:174: dereferencing pointer to incomplete typedereferencing pointer to incomplete type

src/mail_data.c:174: dereferencing pointer to incomplete type
src/mail_data.c:175: dereferencing pointer to incomplete type
src/dewford_trend.c: In function `TrySetTrendyPhrase':
src/dewford_trend.c:168: dereferencing pointer to incomplete type
src/dewford_trend.c:169: dereferencing pointer to incomplete type
src/dewford_trend.c:182: dereferencing pointer to incomplete type
src/dewford_trend.c:189: dereferencing pointer to incomplete type
src/dewford_trend.c:189: dereferencing pointer to incomplete type
src/dewford_trend.c:192: dereferencing pointer to incomplete type
src/dewford_trend.c:203: dereferencing pointer to incomplete type
src/dewford_trend.c: In function `ReceiveDewfordTrendData':
src/dewford_trend.c:283: dereferencing pointer to incomplete type
Makefile:339: recipe for target 'build/emerald/src/mail_data.o' failed
make: *** [build/emerald/src/mail_data.o] Error 1
make: *** Deleting file 'build/emerald/src/mail_data.o'
src/dewford_trend.c: In function `BufferTrendyPhraseString':
src/dewford_trend.c:293: dereferencing pointer to incomplete type
src/dewford_trend.c: In function `IsTrendyPhraseBoring':
src/dewford_trend.c:305: dereferencing pointer to incomplete type
src/dewford_trend.c:305: dereferencing pointer to incomplete type
src/dewford_trend.c:307: dereferencing pointer to incomplete type
src/dewford_trend.c:309: dereferencing pointer to incomplete type
src/dewford_trend.c: In function `GetDewfordHallPaintingNameIndex':
src/dewford_trend.c:323: dereferencing pointer to incomplete type
src/dewford_trend.c:323: dereferencing pointer to incomplete type
Makefile:339: recipe for target 'build/emerald/src/mon_markings.o' failed
make: *** [build/emerald/src/mon_markings.o] Error 1
make: *** Deleting file 'build/emerald/src/mon_markings.o'
src/dewford_trend.c: In function `IsPhraseInSavedTrends':
src/dewford_trend.c:392: dereferencing pointer to incomplete type
Makefile:339: recipe for target 'build/emerald/src/dewford_trend.o' failed
make: *** [build/emerald/src/dewford_trend.o] Error 1
make: *** Deleting file 'build/emerald/src/dewford_trend.o'
Makefile:339: recipe for target 'build/emerald/src/mystery_gift_menu.o' failed
make: *** [build/emerald/src/mystery_gift_menu.o] Error 1
make: *** Deleting file 'build/emerald/src/mystery_gift_menu.o'
src/egg_hatch.c: In function `CheckDaycareMonReceivedMail':
src/egg_hatch.c:411: dereferencing pointer to incomplete type
Makefile:339: recipe for target 'build/emerald/src/battle_anim_dark.o' failed
make: *** [build/emerald/src/battle_anim_dark.o] Error 1
make: *** Deleting file 'build/emerald/src/battle_anim_dark.o'
Makefile:339: recipe for target 'build/emerald/src/battle_anim_new.o' failed
make: *** [build/emerald/src/battle_anim_new.o] Error 1
make: *** Deleting file 'build/emerald/src/battle_anim_new.o'
Makefile:339: recipe for target 'build/emerald/src/battle_anim_water.o' failed
make: *** [build/emerald/src/battle_anim_water.o] Error 1
make: *** Deleting file 'build/emerald/src/battle_anim_water.o'
Makefile:339: recipe for target 'build/emerald/src/egg_hatch.o' failed
make: *** [build/emerald/src/egg_hatch.o] Error 1
make: *** Deleting file 'build/emerald/src/egg_hatch.o'
Makefile:339: recipe for target 'build/emerald/src/battle_tv.o' failed
make: *** [build/emerald/src/battle_tv.o] Error 1
make: *** Deleting file 'build/emerald/src/battle_tv.o'
Makefile:339: recipe for target 'build/emerald/src/pokeball.o' failed
make: *** [build/emerald/src/pokeball.o] Error 1
make: *** Deleting file 'build/emerald/src/pokeball.o'
Makefile:339: recipe for target 'build/emerald/src/field_effect.o' failed
make: *** [build/emerald/src/field_effect.o] Error 1
make: *** Deleting file 'build/emerald/src/field_effect.o'

 

[PorousMist326]

How do you get the scripts? I tried the commands but they do not work.

 

[ghoulslash]

-

It's tough to help with conflicts on pokecommunity, particularly this many - I suggest going to discord to help with individual ones that are especially tricky.

How do you get the scripts? I tried the commands but they do not work.

Which scripts? you can find the IDs for new script commands in data/script_cmd_table.inc. Make sure the IDs match those in asm/macros/event.inc

 

[LLMALX]

I, physically, couldn't be happier right now! Been having merge conflicts for the past two weeks! I wish I knew this existed man

 

[julof]

Hi! how can i add this branch to my pokeemerald-expansion decomp? I don't really understand the "To get it" tutorial. Are these commands for a terminal?
PS: Your work is astonishing ghoul!

 

[Lunos]

Hi! how can i add this branch to my pokeemerald-expansion decomp? I don't really understand the "To get it" tutorial. Are these commands for a terminal?

Yes, they are.
For more information: https://www.pokecommunity.com/threads/432321

 

[julof]

Yes, they are.
For more information: https://www.pokecommunity.com/threads/432321

I don't really understand. I'm probably missing some steps, but this is what I got after typing "git remote add ghoul https://github.com/ghoulslash/pokeemerald" and "git pull ghoul ghoul_expansion":

hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
remote: Enumerating objects: 1690, done.
remote: Counting objects: 100% (1332/1332), done.
remote: Total 1690 (delta 1332), reused 1332 (delta 1332), pack-reused 358
Receiving objects: 100% (1690/1690), 2.82 MiB | 28.00 KiB/s, done.
Resolving deltas: 100% (1425/1425), completed with 427 local objects.
From https://github.com/ghoulslash/pokeemerald
* branch ghoul_expansion -> FETCH_HEAD
* [new branch] ghoul_expansion -> ghoul/ghoul_expansion
error: Your local changes to the following files would be overwritten by merge:
data/layouts/PetalburgCity/map.bin
Please commit your changes or stash them before you merge.
Aborting

It's like waitng for me to merge the branch of ghoul and my pokeemerald-expansion project, but I can't find out what to do. If there exists a command to compile everithing together, what is it? Thanks!

 

[Lunos]

I don't really understand. I'm probably missing some steps, but this is what I got after typing "git remote add ghoul https://github.com/ghoulslash/pokeemerald" and "git pull ghoul ghoul_expansion":

error: Your local changes to the following files would be overwritten by merge:
data/layouts/PetalburgCity/map.bin
Please commit your changes or stash them before you merge.
Aborting

It's like waitng for me to merge the branch of ghoul and my pokeemerald-expansion project, but I can't find out what to do. If there exists a command to compile everithing together, what is it? Thanks!

You're misunderstanding.
Right there, Git is telling you that you made changes of your own to the file data/layouts/PetalburgCity/map.bin.
You need to either discard those changes or pack them in a commit in order to be allowed to perform a git pull. Git wouldn't be able to know what to do with the changes on its own.

Coincidentally, the aforementioned tutorial talks about commits.