Help with a DNS-System and just installing things in general

[kai2342340gamer]

I was using the CFRU for a while and then i decided to move over to decomps, in pokeemerald. I am using the pokeemerald expansion and need help implementing things such as Prof. Leon Dias' Decapitalization, Ghoulslash's Quest Menu, and most importantly a DNS system.
git remote add <name> <link>
git pull <name> <branch>
When i try to follow these steps, I get a lot of merge errors, and then when I try to solve them, I get a lot of compile errors. I have no idea if the fact that I'm using pokeemerald-expansion (rh-hideout) has anything to do with it but i need help. Can someone please help me?

 

[Lunos]

I was using the CFRU for a while and then i decided to move over to decomps, in pokeemerald. I am using the pokeemerald expansion and need help implementing things such as Prof. Leon Dias' Decapitalization, Ghoulslash's Quest Menu, and most importantly a DNS system.

I wouldn't suggest you to use Leon's branch.
Right now that branch is over 1 year old and it has an absurd amount of conflicts when pulled into a branch with the Pokeemerald-expansion.
As of right now, there's conflicts in 329 files.

Instead, I'd suggest you to use AsparagusEduardo's own Decapitalization branch. The amount of conflicts to solve is much smaller.
https://github.com/AsparagusEduardo/pokeemerald/tree/Decapitalization

git remote add <name> <link>
git pull <name> <branch>

That's effectively the way to pull branches, yes.
You first establish a link to the repository containing the branch you want to pull via git remote and then you pull the branch using git pull.

When i try to follow these steps, I get a lot of merge errors, and then when I try to solve them, I get a lot of compile errors.

Nothing that can be done about the fact that you're getting merge conflicts.
When a branch makes changes to a chunk of your code that was already modified in your project before, a merge conflict ensues.
However, if after you solve them you get compile errors, that means you solved those conflicts incorrectly.

I have no idea if the fact that I'm using pokeemerald-expansion (rh-hideout) has anything to do with it but i need help. Can someone please help me?

It could. If someone makes changes in the same areas that the expansion already modified, then a merge conflict is likely to arise there.

As for the help, you'll have to be more specific about what do you need help with. It's gonna be hard for anyone to help you otherwise.
Solving merge conflicts is a matter of picking between the code that was there before the pull or the code that was added when you pulled.
Sometimes though, you may need to make a mix of both pieces of code (old and new) instead.
It's something that the user needs to deal with. You need to read the surrounding code and think which piece of code would make the most sense to keep in your project.

 

[kai2342340gamer]

Hello, thank you for this. I appreciate the help.

I have one more question. When I'm trying to merge my project with this, I get compile errors unrelated to the merge issues I solved, can you help with this?

 

[kai2342340gamer]

also how do you remove overworld poison

 

[Lunos]

I have one more question. When I'm trying to merge my project with this, I get compile errors unrelated to the merge issues I solved, can you help with this?

How do you know or why do you think those errors you're getting are unrelated to the merge?

As for help, I said it above, you'll have to be more specific about what do you need help with. It's gonna be hard for anyone to help you otherwise.
You need to provide a picture of the error, a picture of the part of the codebase where this error is happening, a lead for others to help you out, otherwise you're gonna be putting them up for a guessing game.
If your project was building just fine before pulling that branch, and it stopped building after pulling it in though, there's a 99.9% chance that the merge did cause the errors.

also how do you remove overworld poison

You write code or modify existing code to make it happen.
All the code involving poison overworld damage is in src/field_poison.c.
There's a Gen. 4 implementation I ported straight from Blurose's project made with Pokeruby. It's in the Simple Modifications Directory.
If you don't want to use that in your project, it would still prove useful to read its code as a starting point of sorts to reduce the scope of relevant code you'll have to check to make the feature happen.