You are not logged in.
Is it even possible? Because I think I broke my pokeyellow hack somewhere along the way when I inserted the crysaudio engine. I had to move stuff between banks, and for some reason, the graphics are black and white, I can't sit through the intro or talk to Pikachu without the screen going black and staying black, and the EXP bar is cutting straight through the middle of the enemy Pokémon sprite during the battles.
Without more infomation, it's hard to suggest to you what you might have messed up when merging pokered-crysaudio into pokeyellow
It is certainly possible
I assume you merged the one commit from here?
Seems so, yes.
I'm pretty sure I did... and then added a few personal touches.
Course, Bank 1C is where the troubles and concessions began. As soon as I started making those concessions, I realized things might have gone to hell in a handbasket, and I was right, because among other things, as mentioned earlier, there isn't any color, the screen turns black and stays black both if you sit through the intro sequence past the first shot of Pikachu running towards you and if you talk to Pikachu in the overworld, and the EXP Bar (one of the personal touches I added) cuts straight through the enemy sprite most of the time during battles.
Last edited by Fotomac (2018-03-11 09:19:21)
I think I found the commit you are referring to. I beleive it is "Bringing it up to date" from nostalgia-yellow:
https://github.com/Fotomac/nostalgia-ye … 7b023fceb7
Here is some advice for using git effectively.
Keep commits small and related to only a single idea or update.
Don't put a merge and new custom code in the same commit.
Don't overwrite the default commit message that is generated for merge commits.
Try to come up with better, more direct commit messages than "Finally got it working".
With respect to pokered-crysaudio, I would recommend you consider reverting to before the "Bringing it up to date" merge commit. (you can do this on a new branch so that you can always revert to master if the do-over goes wrong)
Then merge pokered, then merge pokered-cysaudio separately.
Again, don't change the default commit messages of these merges.
If you do these two merges right, you will have two commits with messages similar to:
Merge branch 'master' of pokered
Merge branch 'master' of pokered-crysaudio
What you could also do is wait for me to merge pokered into pokeyellow so they are up-to-date.
Then you could merge pokeyellow, then merge pokered-crysaudio.
That might be a smoother process on your end.