[TUTORIAL] Decomp - From start to finish

TheRisingSean · Dec 1, 2019

Yeah so...

My guide has been out of commission for sometime now. sorry to anyone who came here during the time there was nothing here.
Probably best to follow the guides made by Lunos. I'll direct you. https://www.pokecommunity.com/showthread.php?t=432321

Ephraim225 · Dec 2, 2019

About step 12, could you post exactly what lines I'm supposed to remove from src/pokemon.c? I'm a little confused is all, I don't think my file matches yours exactly. Anyways, thanks in advance for the tutorial, I can already tell it'll be extremely helpful.

TheRisingSean · Dec 2, 2019

About step 12, could you post exactly what lines I'm supposed to remove from src/pokemon.c? I'm a little confused is all, I don't think my file matches yours exactly. Anyways, thanks in advance for the tutorial, I can already tell it'll be extremely helpful.

Hiya there, the screenshot below should be exactly what need to delete

Ephraim225 · Dec 2, 2019

You mean this part right?

Spoiler:

I commented it out and got an error while compiling so I might be doing something wrong.

Vladmir_Fox · Dec 2, 2019

Can someone please help me figure out exactly what I need to remove from the last file (pokemon.c lines 4590-4630)? My "<<<<<<<HEAD" is on line 4560 and the ">>>>>>> " is on line 4646. Do I just remove all of that or is it more specific then that?

HackerL · Dec 2, 2019

Hi, I was able to successfully merge pokemon_expansion without causing errors by accepting current changes in pokemon.c!

Hope this helps!

dioxias · Dec 2, 2019

When i follow these instructions exactly, i end up not creating a .gba file and i dont know what i did wrong. can someone help? the following is the entire output after i type "make"

Spoiler:

TheRisingSean · Dec 3, 2019

Bruh i have never seen that before holy shit. try starting again from scratch, bud

TheRisingSean · Dec 3, 2019

Can someone please help me figure out exactly what I need to remove from the last file (pokemon.c lines 4590-4630)? My "<<<<<<<HEAD" is on line 4560 and the ">>>>>>> " is on line 4646. Do I just remove all of that or is it more specific then that?

I commented it out and got an error while compiling so I might be doing something wrong.

"They need to keep battle engine version of the function in Pokémon. C and delete the mon expansion one"

Ephraim225 · Dec 3, 2019

Alright, I got the ROM to compile, thank you. Just so there's no further confusion I'll explain what to delete from pokemon.c

So in pokemon.c there should be a section that looks like this:

Spoiler:

void PokemonToBattleMon(struct Pokemon *src, struct BattlePokemon *dst)
{
s32 i;
u8 nickname[POKEMON_NAME_LENGTH * 2];

for (i = 0; i < MAX_MON_MOVES; i++)
{
<<<<<<< HEAD
dst->moves = GetMonData(src, MON_DATA_MOVE1 + i, NULL);
dst->pp = GetMonData(src, MON_DATA_PP1 + i, NULL);
}

dst->species = GetMonData(src, MON_DATA_SPECIES, NULL);
dst->item = GetMonData(src, MON_DATA_HELD_ITEM, NULL);
dst->ppBonuses = GetMonData(src, MON_DATA_PP_BONUSES, NULL);
dst->friendship = GetMonData(src, MON_DATA_FRIENDSHIP, NULL);
dst->experience = GetMonData(src, MON_DATA_EXP, NULL);
dst->hpIV = GetMonData(src, MON_DATA_HP_IV, NULL);
dst->attackIV = GetMonData(src, MON_DATA_ATK_IV, NULL);
dst->defenseIV = GetMonData(src, MON_DATA_DEF_IV, NULL);
dst->speedIV = GetMonData(src, MON_DATA_SPEED_IV, NULL);
dst->spAttackIV = GetMonData(src, MON_DATA_SPATK_IV, NULL);
dst->spDefenseIV = GetMonData(src, MON_DATA_SPDEF_IV, NULL);
dst->personality = GetMonData(src, MON_DATA_PERSONALITY, NULL);
dst->status1 = GetMonData(src, MON_DATA_STATUS, NULL);
dst->level = GetMonData(src, MON_DATA_LEVEL, NULL);
dst->hp = GetMonData(src, MON_DATA_HP, NULL);
dst->maxHP = GetMonData(src, MON_DATA_MAX_HP, NULL);
dst->attack = GetMonData(src, MON_DATA_ATK, NULL);
dst->defense = GetMonData(src, MON_DATA_DEF, NULL);
dst->speed = GetMonData(src, MON_DATA_SPEED, NULL);
dst->spAttack = GetMonData(src, MON_DATA_SPATK, NULL);
dst->spDefense = GetMonData(src, MON_DATA_SPDEF, NULL);
dst->abilityNum = GetMonData(src, MON_DATA_ABILITY_NUM, NULL);
dst->otId = GetMonData(src, MON_DATA_OT_ID, NULL);
dst->type1 = gBaseStats[dst->species].type1;
dst->type2 = gBaseStats[dst->species].type2;
dst->type3 = TYPE_MYSTERY;
dst->ability = GetAbilityBySpecies(dst->species, dst->abilityNum);
GetMonData(src, MON_DATA_NICKNAME, nickname);
StringCopy10(dst->nickname, nickname);
GetMonData(src, MON_DATA_OT_NAME, dst->otName);

for (i = 0; i < NUM_BATTLE_STATS; i++)
dst->statStages = 6;

dst->status2 = 0;
}

void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
{
PokemonToBattleMon(&gPlayerParty[partyIndex], &gBattleMons[battlerId]);
gBattleStruct->hpOnSwitchout[GetBattlerSide(battlerId)] = gBattleMons[battlerId].hp;
=======
gBattleMons[battlerId].moves = GetMonData(&gPlayerParty[partyIndex], MON_DATA_MOVE1 + i, NULL);
gBattleMons[battlerId].pp = GetMonData(&gPlayerParty[partyIndex], MON_DATA_PP1 + i, NULL);
}

gBattleMons[battlerId].ppBonuses = GetMonData(&gPlayerParty[partyIndex], MON_DATA_PP_BONUSES, NULL);
gBattleMons[battlerId].friendship = GetMonData(&gPlayerParty[partyIndex], MON_DATA_FRIENDSHIP, NULL);
gBattleMons[battlerId].experience = GetMonData(&gPlayerParty[partyIndex], MON_DATA_EXP, NULL);
gBattleMons[battlerId].hpIV = GetMonData(&gPlayerParty[partyIndex], MON_DATA_HP_IV, NULL);
gBattleMons[battlerId].attackIV = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ATK_IV, NULL);
gBattleMons[battlerId].defenseIV = GetMonData(&gPlayerParty[partyIndex], MON_DATA_DEF_IV, NULL);
gBattleMons[battlerId].speedIV = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPEED_IV, NULL);
gBattleMons[battlerId].spAttackIV = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPATK_IV, NULL);
gBattleMons[battlerId].spDefenseIV = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPDEF_IV, NULL);
gBattleMons[battlerId].personality = GetMonData(&gPlayerParty[partyIndex], MON_DATA_PERSONALITY, NULL);
gBattleMons[battlerId].status1 = GetMonData(&gPlayerParty[partyIndex], MON_DATA_STATUS, NULL);
gBattleMons[battlerId].level = GetMonData(&gPlayerParty[partyIndex], MON_DATA_LEVEL, NULL);
gBattleMons[battlerId].hp = GetMonData(&gPlayerParty[partyIndex], MON_DATA_HP, NULL);
gBattleMons[battlerId].maxHP = GetMonData(&gPlayerParty[partyIndex], MON_DATA_MAX_HP, NULL);
gBattleMons[battlerId].attack = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ATK, NULL);
gBattleMons[battlerId].defense = GetMonData(&gPlayerParty[partyIndex], MON_DATA_DEF, NULL);
gBattleMons[battlerId].speed = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPEED, NULL);
gBattleMons[battlerId].spAttack = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPATK, NULL);
gBattleMons[battlerId].spDefense = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPDEF, NULL);
gBattleMons[battlerId].abilityNum = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ABILITY_NUM, NULL);
gBattleMons[battlerId].otId = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_ID, NULL);
gBattleMons[battlerId].type1 = gBaseStats[gBattleMons[battlerId].species].type1;
gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2;
gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname);
StringCopy10(gBattleMons[battlerId].nickname, nickname);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battlerId].otName);

hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(battlerId)];
*hpSwitchout = gBattleMons[battlerId].hp;

for (i = 0; i < 8; i++)
gBattleMons[battlerId].statStages = 6;

gBattleMons[battlerId].status2 = 0;
>>>>>>> 1a5c610b5c6b5ec61cd224822f0d28556111fc45
sub_803FA70(battlerId);
ClearTemporarySpeciesSpriteData(battlerId, FALSE);
}

Every line I've highlighted in green needs to be deleted or commented out. Then it should be okay.

dioxias · Dec 4, 2019

ah i started from scratch, and deleted what @Ephraim225 said they deleted, and it worked for me this time. i think the tutorial is a little different than the latest versions. as an example, the general.h pokemon number for me was in /include/global.h . also @TheRisingSean, you are missing a bracket for a color for step 12 at the start. thank u all for ur help with this!

TrainerX493 · Dec 5, 2019

This is great! I was wanting to get started with this, and now I should be able to hop right in. Now we just need people to upload the cool features they have for themselves to a central place (preferably this site) and the Gen 8 stuff made and then the hacks can really get going in full force.

Dr. POP · Dec 5, 2019

Thanks for this tutorial! I'm happy these guidelines are starting to trickle in, will make it easier for the average users like myself to give it a(nother) shot.

invisiblewalrus · Dec 5, 2019

I made it through all but the last step.

When trying to pull the pokemon expansion from egg, (this step):
$ git pull EGG pokemon_expansion/COLOR]
I get this error
fatal: invalid refspec 'pokemon_expansion/COLOR]'

Any idea whats going on here?

UltimaSoul · Dec 6, 2019

Did you make sure to add EGG as a remote like in step 7?

TrainerX493 · Dec 6, 2019

TheRisingSean said:
Hello, TheRisingSean here, and today - with the help of Dizzyegg, I'm going to walk you - a noob, though the process of: Installing git, forking a repo, creating remotes, merging, and resolving merge conflicts.
Now the end goal of this tutorial is to have a local repo with all off Dizzyegg's major branches (Item expansion, Pokémon expansion and Battle engine) all merged together with no issues. NOTE: This tutorial was written in mind for those with little to no experience with decomp before, some things in this tutorial could be difficult to comprehend, don't hesitate to ask for help here on pokecommunity, RHH or the pret server (all linked below) without further ado, let's get cracking..!

Hi, thank you for the guide, I got everything up and running thanks to you. B after spending the day getting set up, I added some tweaks for your guide fixing errors and such.
--STEP 3 old--

Spoiler:

========================================
Added text for easy copy/paste
--STEP 3 new--

Spoiler:

========================================
--STEP 8 old--

Spoiler:

========================================
Just added a / to "your"
--STEP 8 new--

Spoiler:

========================================
--STEP 10 old--

Spoiler:

========================================
Changed pokemon expansion into pokemon_expansion for consistency. Reorded text to avoid confusion.
--STEP 10 new--

Spoiler:

========================================
--STEP 11 old--

Spoiler:

========================================
Changed pokemon expansion & pokemon_expansion to pokemon_expansion for consistency. Changed "file explorer to Notepad++, since they should already know what it is and have it to use, and way to many dummies would get confused.
--STEP 11 new--

Spoiler:

========================================
--STEP 12 old--

Spoiler:

========================================
Fixed pokemon_expansion, added to open in Notepad++, updated Ctrl+f line for clearity, added (shown in image below) for the last edit, added some "" for the first note, added color to all copy/pate text, and a few other tweaks/fixes.
--STEP 12 new--

Spoiler:

Now this is our final merge, we are going to be met with a few conflicts, but that will not be an issue as these are fairly simple to deal with.
Enter the following command:
git pull EGG pokemon_expansion

If you've been following correctly, you should have a total of five merge conflicts.

First of all, go to:
- src/data/pokemon/base_stats.h
- Open with Notepad++
- Press ctrl + a
- Press backspace
Then go to: https://raw.githubusercontent.com/DizzyEggg/pokeemerald/pokemon_expansion/src/data/pokemon/base_stats.h
- Press Ctrl + a
- Press Ctrl + c
- Go back to base_stats.h and paste what was copied in the link
Note: This takes a while, there is a LOAD of text

Secondly, go to Src/data/pokemon/evolution.h
Press Ctrl + F, select navigate then 'replace' "ITEM_NONE,/*" with nothing.
Replace "MOVE_NONE,/*" with nothing
Replace "*/" with a comma
Borrowed from this post: https://www.pokecommunity.com/showpost.php?p=10029240&postcount=36 - Hooray for Lunos!

Thirdly, open the file src/data/pokemon/level_up_learnsets.h and replace everything with the contents of this file.

Fourthly, go to include/global.h, and on line 73 is a list defining the overall amount of Pokemon, keep the line with the value to 808 and delete the other one.
Note: When finished with a merge, remove all instances of: "<<<<<<HEAD", "======" and ">>>>(branchname)" - do this on all the files you changed
Note 2: You may find the line containing the overall amount of pokemon on a line that isn't 72, this may be subject to change as egg is constantly editing his repo.

And just like that you're finished merging, all of egg's branches are successfully merged together. All that's left is too is go back onto git and:
Git add src
AND
Git add include

========================================
Other Notes: Battle Engine and caused a text file to open with the contents of the spoiler below. This was not mentioned, but just closing it is all that is needed:

Spoiler:

Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

For the 5th part of the conflit, what you have listed is no longer a conflict, but there is another part where there is a conflict instead. I'll let you decide how it should be fixed and handled, but I just let it force the commit through Git gui.
Also a link to PoryMap would be helpful too.

invisiblewalrus said:

I made it through all but the last step.

When trying to pull the pokemon expansion from egg, (this step):
$ git pull EGG pokemon_expansion/COLOR]
I get this error
fatal: invalid refspec 'pokemon_expansion/COLOR]'

Any idea whats going on here?

Click to expand...

Try using git pull EGG pokemon_expansion

invisiblewalrus · Dec 7, 2019

Thanks for the help!

Just a heads up for the tutorial, I believe that in step 12, the fourth edit should actually be to the file include/global.h (not src/data/pokemon/global.h)

TheRisingSean · Dec 7, 2019

TrainerX493 said:
Hi, thank you for the guide, I got everything up and running thanks to you. B after spending the day getting set up, I added some tweaks for your guide fixing errors and such.

You absolute legend you didnt need too do that! I'll add your edits to the tutorial and credit you, thank you so much holy shit

Diego Mertens · Dec 7, 2019

Spoiler:

TheRisingSean said:
Hello, TheRisingSean here, and today - with the help of Dizzyegg, I'm going to walk you - a noob, though the process of: Installing git, forking a repo, creating remotes, merging, and resolving merge conflicts.
Now the end goal of this tutorial is to have a local repo with all off Dizzyegg's major branches (Item expansion, Pokémon expansion and Battle engine) all merged together with no issues. NOTE: This tutorial was written in mind for those with little to no experience with decomp before, some things in this tutorial could be difficult to comprehend, don't hesitate to ask for help here on pokecommunity, RHH or the pret server (all linked below) without further ado, let's get cracking..!

This tutorial was written for Windows users in mind.

--STEP 1-- Setting up your GitHub account

Spoiler:

If you have not already, you will need to set up a GitHub account in order to make public changes to your repo.

So let's head over tohttps://github.com/and set one up!

Click on `sign up` in the top right corner and fill out the boxes accordingly, make sure you use your actual email address as you will have to confirm the creation of the account through your email.

--STEP 2--Installing git

Spoiler:

So for starters, we're going to install a few bits of handy software - it's absolutely vital you follow the tutorial exactly as it's listed here.

The first thing we're going to install its called "git".
Git is a great tool that allows you to keep track of all the changes you made to your project, it also comes with the ability to make new branches and stuff. It's very useful and quite simply a necessity if you wish to use the decomp.

Head over to: https://git-scm.com/downloads and download the latest source release for windows - highlighted here:

This download may take a while…

Once the Wizard is open, click "next" and make sure the following is ticked:

Click "Next" and change 'vim' to a text editor of your choice - I recommend notepad++

Click "next" again and select the middle option. From there on just keep clicking next till you have the option to install. Click "install"

--STEP 3--Setting up git with a GitHub account

Spoiler:

So very quickly, we're going to set up the newly installed 'git' with our GitHub account. This will save the hassle of entering your GitHub login every time you wish to make a commit to your repo.

Find git in the start menu and open it, and enter the following commands, with your GitHub username and email in their respective areas:

git config --global user.name [ENTER_YOUR_GITHUB_NAME_HERE]
git config --global user.email [ENTER_YOUR_GITHUB_EMAIL_HERE]

--STEP 4--Making a fork of pokeemerald

Spoiler:

So now we're going to make What it does it creates a clone of pokeemerald that's assigned to your github account.

Head over too: https://github.com/pret/pokeemerald , make sure you're signed in and click on "fork"

And thats basically everything we need to do on GitHub, further on in the tutorial we will be needing too get the links of two other repos, but don't worry, they'll be provided to you anyways.

--STEP 5--Create a blank pokeemerald folder

Spoiler:

This will be - by far, the easiest step in the tutorial, we will be making a folder in the root of your "c: drive" for convenience sake we're going to call it "pokeemerald"

Make a folder like this:

--STEP 6--Initializing a git repository

Spoiler:

Click into the pokeemerald folder you had just made, inside this empty folder, right click and an option called "git bash" should appear. Click on that. It should open git and look something like this:

Then you're going to want to type "git init" and press enter - This will make initialize a git repository in this folder and will make git usable there. Note: a hidden folder called git should appear.

This is now you're main/master branch, shown by the blue text next to the folder's pathway:

--STEP 7--Creating the 3 major remotes

Spoiler:

Alright, step 7 is setting up remotes. Remotes are basically links to repositories of pokeemerald forks from different people on github - like the fork you made earlier.

We will be setting up 3 different remotes:
- One pointing towards Pret (We will be calling this UPSTREAM)
- One pointing towards Egg's repo (We will be calling this EGG)
- One pointing towards Your own repo (We will be calling this ORIGIN)

In your pokeemerald folder - on git, enter the following commands:

git remote add UPSTREAM https://github.com/pret/pokeemerald.git

git remote add EGG https://github.com/dizzyeggg/pokeemerald.git

git remote add ORIGIN https://github.com/[YOUR-GIT-HUB-USERNAME]/pokeemerald.git

Note: If you mess up with the remote names or links somehow, you can remove a remote with the command:
git remote remove BRANCH-NAME-HERE .

Once you've done that, enter the command "git remote -v" and the result should look like this - with the exception of the ORIGIN link:

--STEP 8--Copying Pret

Spoiler:

So for step 8 we will be copying pret's pokeemerald into the local folder on your PC.

To do this you will need to enter the following command:

git pull ORIGIN master
What this command does is copy stuff from the remote we called Origin, from branch called master - In our case it's copying from the fork we've created in step 2 - hence why when naming Origin we provided your repo link.

Please wait some time for git to finish this command, this may take some time depending on your download speed.

***If you don't plan on using egg's modifications, you're now finished, open up msys2 and type in cd c:/pokeemerald, and then make to build your rom, this will take a while depending on your computer specs, you can do make -j* to devote more cores to the make process, * being replaced with the amount of core you wish to use.***

--STEP 9--Merging Item Expansion and Master

Spoiler:

This here will be one out of three merges, this will be the easiest as it does not conflict with master, battle engine or pokemon expansion. But for the moment, lets talk about branches: Branches are used so you can have different features or mods of the same repo, but not colliding with each other. Like DizzyEgg is doing with his stuff, i.e: pokemon expansion and battle engine are two different branches.

Make sense? No? - well you can always ask around here.

Merging branches is fairly simple, but can be a pain on your first few times around. To merge master and dizzy egg's item expansion, type in the command:
git pull EGG item_expansion

What we've requested here is for a copy of Egg's branch - Item_expansion, to merge with our ORIGIN Master.
Wait a few seconds and you should see something like this:

This means you've successfully merged Egg's item_expansion with your master.

--STEP 10--Merging: merged master with battle_engine

Spoiler:

This merge is as easy as the last one, though we're going to have to solve a few merge conflicts when we go to merge pokemon_expansion with this new master, enter the following command:
git pull EGG battle_engine_v2

--STEP 11--Preparation to merge with pokemon_expansion.

Spoiler:

When we go to merge pokemon_expansion with our current branch, we're going to be met with a lot of merge conflicts, so for the time being, we're going to take a few adjustments a certain file to prevent any complicated issues.

Go to: pokeemerald/include/constants/battle_config.h in Notepad++.
- Remove lines 13-38 (shown in image below)

- Remove lines 4-11 (Shown in next image below)

What we have just done here is removed placeholder values that were once needed but are no longer. Now we are all ready to merge with poke_expansion!

--STEP 12--Merging: Merging with pokemon expansion

Spoiler:

Now this is our final merge, we are going to be met with a few conflicts, but that will not be an issue as these are fairly simple to deal with.
Enter the following command:
git pull EGG pokemon_expansion/COLOR]

If you've been following correctly, you should have a total of five merge conflicts.

First of all, go to:
- src/data/pokemon/base_stats.h
- Open with Notepad++
- Press ctrl + a
- Press backspace
Then go to: https://raw.githubusercontent.com/DizzyEggg/pokeemerald/pokemon_expansion/src/data/pokemon/base_stats.h
- Press Ctrl + a
- Press Ctrl + c
- Go back to base_stats.h and paste what was copied in the link
Note: This takes a while, there is a LOAD of text

Secondly, go to Src/data/pokemon/evolution.h
Press Ctrl + F and navigate to 'replace' "ITEM_NONE,/*" with nothing.
Replace "MOVE_NONE,/*" with nothing
Replace " */ " with a comma
Borrowed from this post: https://www.pokecommunity.com/showpost.php?p=10029240&postcount=36 - Hooray for Lunos!

Thirdly, replace the file level_up_learnsets.h (Src/data/pokemon/) with the contents of this file.

Fourthly, go to src/data/pokemon/global.h, and on line 73 is a list defining the overall amount of Pokemon, keep the line with the value to 808 and delete the other one.
Note: When finished with a merge, remove all instances of: <<<<<<HEAD, ====== and >>>>branchname - do this on all the files you changed
Note 2: You may find the line containing the overall amount of pokemon on a line that isnt 72, this may be subject to change as egg is constantly editing his repo.

Lastly! Navigate too src/pokemon.c and remove lines 4590-4630 and save!

And just like that you're finished merging, all of egg's branches are successfully merged together. All that's left is too is go back onto git and:
Git add src
AND
Git add include.

And finally, at lastly, enter Merge branch 'battle_engine_v2'

And thats all from me for now! I'm now going to pass you over to the lovely hands of Lunos himself and the wonderful and easy guide on how to build the rom you've just merged together, if you have any questions or doubts, feel free to comment below or dm me on discord - TheRisingSean#0420

Credits: Dizzyeggg, Lunos, Ultima, FattyBoris and of course myself - TheRisingSean

Edit: thank you too TrainerX493 for his glorious edits, i believe I got them all down, absolute legend

i-i dont know what i did, but the "git pull EGG battle_engine_v2" it gives me errors.
i tried to do all again by deleting the first thing, but it says me "pulling is not possible because you have unmerged files."
and i dont know what to do
also, the "master" thing now says "master:MERGING" but it does nothing, i thing i messed up with all and i have to try again with another account...
what do i do?
well, i deleted my thing but the "git pull EGG battle_engine_v2" still doesn't work.
"automatic merge failed; fix conflicts and then commit the result"
but, what does that means?
sorry, but i'm new at this and...
i dont know how to do a lot of things yet...
the merging conflicts are in "battle_util.c" and "battle_interface.c"

DizzyEgg · Dec 9, 2019

Diego Mertens said:
Spoiler:

i-i dont know what i did, but the "git pull EGG battle_engine_v2" it gives me errors.

Right, it was because my repo wasn't up-to-date with pret's. Cancel the merge(git reset --hard HEAD) and it should work this time.

[TUTORIAL] Decomp - From start to finish

More options

TheRisingSean

Back, and better than ever

Ephraim225

Freaky Frillish Guy

TheRisingSean

Back, and better than ever

Ephraim225

Freaky Frillish Guy

Vladmir_Fox

HackerL

dioxias

TheRisingSean

Back, and better than ever

TheRisingSean

Back, and better than ever

Ephraim225

Freaky Frillish Guy

dioxias

TrainerX493

Dr. POP

invisiblewalrus

UltimaSoul

TrainerX493

invisiblewalrus

TheRisingSean

Back, and better than ever

Diego Mertens

DizzyEgg