[Other] Help! I just followed 2 tutorials and the TWO didn't work...

[McPaul]

I just want to hang myself right now!

The first is this one: https://www.pokecommunity.com/posts/9986048/

Giving me this:




The second is this one: https://www.pokecommunity.com/posts/10167488/

Giving me this infinite stupid loop:



What do I do? I hate it so much when I thought I followed everything scrupulously and then nothing works it makes me want to kill myself so much!

Maybe can someone help me please? Thanks a lot in advance!

 

[McPaul]

I'm screwed because if I want to go back it says .o files don't want to and if I want to go forward I get those error messages my hack is over...

 

[Lunos]

I just want to hang myself right now!

The first is this one: https://www.pokecommunity.com/posts/9986048/

Giving me this:

View attachment 94734


The second is this one: https://www.pokecommunity.com/posts/10167488/

Giving me this infinite stupid loop:

View attachment 94735

What do I do? I hate it so much when I thought I followed everything scrupulously and then nothing works it makes me want to kill myself so much!

Maybe can someone help me please? Thanks a lot in advance!

For Egg's reusable repels, you could just pull his repel branch directly, correct the sound effect label in data/scripts/repel.inc and have that working instead of manually applying the changes yourself.

git remote add egg https://github.com/DizzyEggg/pokeemerald
git pull egg repel

I quickly cooked up a merged branch with the battle_engine, item_expansion and pokemon_expansion myself, pulled the repel branch, fixed the sound effect label in that script and everything is working fine.
A ROM gets built and the multichoicebox certainly shows up when a Repel's effect ends if you do choose to use another one.

As for the bag sorting issue, you couldn't pull the bag-sort branch of Ghoulslash because you had modified files floating around.
EDIT: To expand a bit on this, in my tutorial about merging DizzyEgg's branches I touch this matter.
When you modify files and don't store those changes in a commit, or when a merge is not completed successfully and you fix its conflicts, the changes you made are not stored anywhere. They're in a pool of sorts, so you have to store them in the form of a commit.

 

[McPaul]

For Egg's reusable repels, you could just pull his repel branch directly, correct the sound effect label in data/scripts/repel.inc and have that working instead of manually applying the changes yourself.

git remote add egg https://github.com/DizzyEggg/pokeemerald
git pull egg repel

I quickly cooked up a merged branch with the battle_engine, item_expansion and pokemon_expansion myself, pulled the repel branch, fixed the sound effect label in that script and everything is working fine.
A ROM gets built and the multichoicebox certainly shows up when a Repel's effect ends if you do choose to use another one.

As for the bag sorting issue, you couldn't pull the bag-sort branch of Ghoulslash because you had modified files floating around.
EDIT: To expand a bit on this, in my tutorial about merging DizzyEgg's branches I touch this matter.
When you modify files and don't store those changes in a commit, or when a merge is not completed successfully and you fix its conflicts, the changes you made are not stored anywhere. They're in a pool of sorts, so you have to store them in the form of a commit.

Thanks for answering.
I did

git remote add egg https://github.com/DizzyEggg/pokeemerald
git pull egg repel

And now BOTH problems are unmerged/conflicted files... I don't see a single possible outcome anymore.

 

[Lunos]

Thanks for answering.
I did

git remote add egg https://github.com/DizzyEggg/pokeemerald
git pull egg repel

And now BOTH problems are unmerged/conflicted files... I don't see a single possible outcome anymore.

Assuming you've been making commits after making changes every now and then, you could just reset to your latest commit by using git reset --hard and then proceed to pull Egg's Repel branch as I explained above.

Once you get that working and got the sound effect label change stored in a commit too, you could then proceed to pull Ghoulslash's bag-sort branch.

 

[McPaul]

What are commits?

git reset --hard resets pokeemerald to its original form?

 

[Lunos]

What are commits?

git reset --hard resets pokeemerald to its original form?

I already explained concepts like "commits" in the tutorial I linked in one of my previous posts here.
The gist of it is that they're backup points that contain your repository in the state it was in when the commit in question was created.

And what git reset --hard does is that it resets your repository to the state it was in your latest commit.
Judging by how you don't seem to know about commits though, it's probably safe to say that you didn't make commits storing your modifications as you were doing them.
So yeah, you're in a somewhat tough spot.
Using git status will tell you all the files that you've currently modified, and whose changes are floating around.
Depending on the amount of files that command reports back, you should be able to tell whether using git reset --hard is worth it or not.