[Pokeemerald] Ghoul's Expansion Branch

ghoulslash · Dec 20, 2021

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 · Dec 24, 2021

you truly are the G.O.A.T

Primordial · Jan 8, 2022

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:

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:

in src/battle_scrip_commands - Removing head

Spoiler:

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:

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:

Code:

    [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:

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:

Code:

    [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:

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:

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:

Code:

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:

Code:

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:

Code:

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:

Code:

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:

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

Spoiler:

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:

PorousMist326 · Feb 19, 2022

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

ghoulslash · Feb 20, 2022

Primordial said:
-

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.

PorousMist326 said:
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 · Nov 5, 2022

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 · Nov 13, 2022

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 · Nov 13, 2022

julof said:
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/showthread.php?t=432321

julof · Nov 20, 2022

Lunos said:
Yes, they are.
For more information: https://www.pokecommunity.com/showthread.php?t=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 · Nov 20, 2022

julof said:
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

Click to expand...

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.

[Pokeemerald] Ghoul's Expansion Branch

More options

ghoulslash

SmokingArmy

Primordial

PorousMist326

ghoulslash

LLMALX

julof

Lunos

Random Uruguayan User

julof

Lunos

Random Uruguayan User