Our software update is now concluded. You will need to reset your password to log in. In order to do this, you will have to click "Log in" in the top right corner and then "Forgot your password?".
Welcome to PokéCommunity! Register now and join one of the best fan communities on the 'net to talk Pokémon and more! We are not affiliated with The Pokémon Company or Nintendo.
I am using them what I did was commit a few of the branches from different repositories the Gen4bike and Gen6 EXP Share from your repo
A few from Ghoul and Dizzy Made sure to correct all the conflicts as well
I see Thank you very much xD
Why does this Error pop up now?
$ git checkout battle_engine_v2
error: pathspec 'battle_engine_v2' did not match any file(s) known to git
Sure
EDIT::: I fixed it, I restarted the whole process had to increase merge.renamelimit variable
Also is there a way I could build this so I can use it in PGE?
Thank you for responding
I did accidentally delete it however I started over and got a new error
make: *** [Makefile:254: build/emerald/src/pokemon.o] Error 1
make: *** Waiting for unfinished jobs....
Can anyone help me I am getting this error
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/battle_anim_effects_3.o build/emerald/src/battle_anim_effects_3.s
tools/gbagfx/gbagfx.exe graphics/interface/ball/particles2.4bpp graphics/interface/ball/particles2.4bpp.lz...