[Pokeemerald] About the basics of Git and starting a project with the Pokeemerald-expansion

[PokemonCrazy]

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

Are you in the right directory?

 

[HeroSigma]

Are you in the right directory?

Yup I had to start over the whole process reinstall devkit etc to fix it

 

[Lunos]

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

Are you sure that you cloned DizzyEgg's Pokeemerald repository and not Pret's?
That error is basically telling you that there isn't a branch called "battle_engine_v2" in your repository.

If you're sure that you have cloned Egg's repository, then try git fetch master and then try git checkout battle_engine_v2 again.

 

[HeroSigma]

I accidentally cloned Pret's

 

[HeroSigma]

I didn't touch this file why is this an error?

 

[Lunos]

I didn't touch this file why is this an error?

View attachment 92932

Without knowing what did you do, it's hard to tell. If you're using the item_expansion branch though, those items should be labeled as ITEM_X_DEFENSE and ITEM_X_SP_ATK.

 

[HeroSigma]

Without knowing what did you do, it's hard to tell. If you're using the item_expansion branch though, those items should be labeled as ITEM_X_DEFENSE and ITEM_X_SP_ATK.

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

 

[PokemonCrazy]

A few from Ghoul and Dizzy Made sure to correct all the conflicts as well

I believe this is caused by Ghoulslash's bag sort feature. What Lunos said should fix your issue—just go into item_menu.c and find the cases of ITEM_X_DEFEND and ITEM_X_SPECIAL and change them to the proper values of ITEM_X_DEFENSE and ITEM_X_SP_ATK respectively.

 

[dharc5]

Hi I've been getting a lot of makefile errors when trying to compile this and I was wondering if anyone could help me with it. The most recent one looks like this and I'm not sure what to make of it

$ make -j4
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/pokemon_size_record.o build/emerald/src/pokemon_size_record.s
make: *** [Makefile:255: build/emerald/src/pokemon.o] Error 1
make: *** Waiting for unfinished jobs....
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/pokemon_jump.o build/emerald/src/pokemon_jump.s
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/pokemon_storage_system.o build/emerald/src/pokemon_storage_system.s

 

[Lunos]

Hi I've been getting a lot of makefile errors when trying to compile this and I was wondering if anyone could help me with it. The most recent one looks like this and I'm not sure what to make of it

$ make -j4
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/pokemon_size_record.o build/emerald/src/pokemon_size_record.s
make: *** [Makefile:255: build/emerald/src/pokemon.o] Error 1
make: *** Waiting for unfinished jobs....
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/pokemon_jump.o build/emerald/src/pokemon_jump.s
arm-none-eabi-as -mcpu=arm7tdmi --defsym MODERN=0 -o build/emerald/src/pokemon_storage_system.o build/emerald/src/pokemon_storage_system.s

Are you sure that's the full log given to you by the Terminal?
I honestly never came across anything like that :/ ...

I tried to merge the branches just now, and everything is still working perfectly and exactly the same as I explain it in the main post.
I'd suggest you to start from scratch.

 

[igorfs10]

Hey guy. Long time no see.

Have you faced this error?

Spoiler:

g++ -Wall -std=c++11 -O2 json11.cpp mapjson.cpp -o mapjson
cc -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 main.c extended.c -o aif2pcm -lm
g++ -Wall -std=c++11 -O2 -I . jsonproc.cpp -o jsonproc
g++ -std=c++11 -O2 -Wall -Wno-switch -Werror main.cpp sym_file.cpp elf.cpp -o ramscrgen
g++ -Wall -Werror -std=c++11 -O2 scaninc.cpp c_file.cpp asm_file.cpp source_file.cpp -o scaninc
cc -Wall -Wextra -Werror -std=c11 -O2 bin2c.c -o bin2c
cc -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK main.c convert_png.c util.c font.c -o rsfont -lpng -lz
cc gbafix.c -o gbafix
cc -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c huff.c -o gbagfx -lpng -lz
g++ -std=c++11 -O2 -Wall -Wno-switch -Werror agb.cpp error.cpp main.cpp midi.cpp tables.cpp -o mid2agb
g++ -std=c++11 -O2 -Wall -Wno-switch -Werror asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp utf8.cpp -o preproc
arm-none-eabi-as -mcpu=arm7tdmi -o build/asm/loader.o asm/loader.s
../../tools/ramscrgen/ramscrgen .bss sym_bss.txt ENGLISH > build/sym_bss.ld
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash_1m.o build/src/agb_flash_1m.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash_mx.o build/src/agb_flash_mx.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/siirtc.o build/src/siirtc.s
../../tools/gbagfx/gbagfx graphics/msg_box.png graphics/msg_box.4bpp
../../tools/gbagfx/gbagfx graphics/msg_box.png graphics/msg_box.gbapal
../../tools/gbagfx/gbagfx graphics/msg_box.tilemap graphics/msg_box.tilemap.lz
../../tools/gbagfx/gbagfx graphics/debug_digits.png graphics/debug_digits.4bpp
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash_le.o build/src/agb_flash_le.s
../../tools/ramscrgen/ramscrgen ewram_data sym_ewram.txt ENGLISH > build/sym_ewram.ld
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash.o build/src/agb_flash.s
../../tools/gbagfx/gbagfx graphics/msg_box.4bpp graphics/msg_box.4bpp.lz
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/rtc.o build/src/rtc.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/asm/libagbsyscall.o asm/libagbsyscall.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/asm/crt0.o asm/crt0.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/main.o build/src/main.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/flash.o build/src/flash.s
../../tools/ramscrgen/ramscrgen COMMON sym_common.txt ENGLISH -c build/src,common_syms > build/sym_common.ld
cd build && sed -f ../../ld_script.sed ../ld_script.txt | sed "s#tools/#../tools/#g" > ld_script.ld
sed: file ../../ld_script.sed line 3: extra characters after command
make[2]: *** [Makefile:187: build/ld_script.ld] Error 1
make[2]: *** Deleting file 'build/ld_script.ld'
make[1]: *** [Makefile:169: payload] Error 2
make: *** [Makefile:334: berry_fix] Error 2

 

[Jaizu]

Hey guy. Long time no see.

Have you faced this error?

Spoiler:

g++ -Wall -std=c++11 -O2 json11.cpp mapjson.cpp -o mapjson
cc -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 main.c extended.c -o aif2pcm -lm
g++ -Wall -std=c++11 -O2 -I . jsonproc.cpp -o jsonproc
g++ -std=c++11 -O2 -Wall -Wno-switch -Werror main.cpp sym_file.cpp elf.cpp -o ramscrgen
g++ -Wall -Werror -std=c++11 -O2 scaninc.cpp c_file.cpp asm_file.cpp source_file.cpp -o scaninc
cc -Wall -Wextra -Werror -std=c11 -O2 bin2c.c -o bin2c
cc -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK main.c convert_png.c util.c font.c -o rsfont -lpng -lz
cc gbafix.c -o gbafix
cc -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c huff.c -o gbagfx -lpng -lz
g++ -std=c++11 -O2 -Wall -Wno-switch -Werror agb.cpp error.cpp main.cpp midi.cpp tables.cpp -o mid2agb
g++ -std=c++11 -O2 -Wall -Wno-switch -Werror asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp utf8.cpp -o preproc
arm-none-eabi-as -mcpu=arm7tdmi -o build/asm/loader.o asm/loader.s
../../tools/ramscrgen/ramscrgen .bss sym_bss.txt ENGLISH > build/sym_bss.ld
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash_1m.o build/src/agb_flash_1m.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash_mx.o build/src/agb_flash_mx.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/siirtc.o build/src/siirtc.s
../../tools/gbagfx/gbagfx graphics/msg_box.png graphics/msg_box.4bpp
../../tools/gbagfx/gbagfx graphics/msg_box.png graphics/msg_box.gbapal
../../tools/gbagfx/gbagfx graphics/msg_box.tilemap graphics/msg_box.tilemap.lz
../../tools/gbagfx/gbagfx graphics/debug_digits.png graphics/debug_digits.4bpp
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash_le.o build/src/agb_flash_le.s
../../tools/ramscrgen/ramscrgen ewram_data sym_ewram.txt ENGLISH > build/sym_ewram.ld
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/agb_flash.o build/src/agb_flash.s
../../tools/gbagfx/gbagfx graphics/msg_box.4bpp graphics/msg_box.4bpp.lz
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/rtc.o build/src/rtc.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/asm/libagbsyscall.o asm/libagbsyscall.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/asm/crt0.o asm/crt0.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/main.o build/src/main.s
arm-none-eabi-as -mcpu=arm7tdmi -o build/src/flash.o build/src/flash.s
../../tools/ramscrgen/ramscrgen COMMON sym_common.txt ENGLISH -c build/src,common_syms > build/sym_common.ld
cd build && sed -f ../../ld_script.sed ../ld_script.txt | sed "s#tools/#../tools/#g" > ld_script.ld
sed: file ../../ld_script.sed line 3: extra characters after command
make[2]: *** [Makefile:187: build/ld_script.ld] Error 1
make[2]: *** Deleting file 'build/ld_script.ld'
make[1]: *** [Makefile:169: payload] Error 2
make: *** [Makefile:334: berry_fix] Error 2

You are missing agbcc

 

[igorfs10]

You are missing agbcc

I have in tools folder. Inside has 3 folders:
bin with 3 files, lib with 2 .a files and include with 2 folders and a lot of .h files.
Am I missing something?

I am trying to compile with wsl2.

 

[Lunos]

Hey guy. Long time no see.

Have you faced this error?

sed: file ../../ld_script.sed line 3: extra characters after command

I have in tools folder. Inside has 3 folders:
bin with 3 files, lib with 2 .a files and include with 2 folders and a lot of .h files.
Am I missing something?

I am trying to compile with wsl2.

How did you clone the repository? Did you use Git for Windows? If you did, don't.
You should be using the git clone command as stated in the main post of this thread.

Also, I do not offer support to WSL2 as I myself haven't tried it yet, so if you are not willing to follow this tutorial to a T, I'd suggest you to open a new thread in the Decomp & Disassembly section of the forum for your needs.

 

[igorfs10]

How did you clone the repository? Did you use Git for Windows? If you did, don't.
You should be using the git clone command as stated in the main post of this thread.

Also, I do not offer support to WSL2 as I myself haven't tried it yet, so if you are not willing to follow this tutorial to a T, I'd suggest you to open a new thread in the Decomp & Disassembly section of the forum for your needs.

I'm following tutorial the way you made with every step made in cmd, I used wsl just to compile, but there is just one step that I skipped because pokemon.c conflict doesn't happen here. I forgot to say that on the first try. Sorry 😔
Maybe something weird is happening here on merge.

I don't know if wsl2 can be the issue, it worked nice with your wsl tutorial and compilled the poke_emerald succefully.

I'll try to compile the branches separated and try to compile with item merged and after with everything merged to see where the issue raises.

 

[Fansity]

Would you know why this error appears?

Spoiler:

 

[Lunos]

Would you know why this error appears?

Spoiler:

Sorry, I don't. Did you clone Pokeemerald by using the git clone command as stated in the main post, or did you download it from the repo at github.com?

 

[Fansity]

Sorry, I don't. Did you clone Pokeemerald by using the git clone command as stated in the main post, or did you download it from the repo at github.com?

I used these commands:

Spoiler:

git clone https://github.com/pret/pokeemerald
git clone https://github.com/pret/agbcc

cd ./agbcc
./build.sh
./install.sh ../pokeemerald

cd ../pokeemerald

The error demonstrated in my image occurs after using the make compare command.

Spoiler:

WARNING: 1 calculated checksum Does not match

 

[Lunos]

I used these commands:

Spoiler:

git clone https://github.com/pret/pokeemerald
git clone https://github.com/pret/agbcc

cd ./agbcc
./build.sh
./install.sh ../pokeemerald

cd ../pokeemerald

The error demonstrated in my image occurs after using the make compare command.

Spoiler:

WARNING: 1 calculated checksum Does not match

If you're trying to build a clean ROM of Pokémon Emerald, this is not the thread for you.
In this thread, the focus is to build a ROM of Pokémon Emerald with Pokeemerald containing DizzyEgg's feature branches specifically.

That being said, the actual errors that are not allowing a ROM to be built, which are:

make[3]: *** [Makefile:115: rom] Error 1
make[2]: *** [Makefile:169: payload] Error 2
make[1]: *** [Makefile:332: berry_fix] Error 2

They're errors that I really don't know how to help you with regardless, as I never came across them myself, and they simply do not happen on my end.
Plus, I do not know the exact steps that you are doing on your end.

The only thing I can suggest you is to start from scratch.
EDIT: Oh yeah, if you actually used git clone in the terminal/shell of maybe Git for Windows, you utilized a GUI for Git at any point at all, I highly suggest you not to do that.

 

[Fansity]

Spoiler:

If you're trying to build a clean ROM of Pokémon Emerald, this is not the thread for you.
In this thread, the focus is to build a ROM of Pokémon Emerald with Pokeemerald containing DizzyEgg's feature branches specifically.

That being said, the actual errors that are not allowing a ROM to be built, which are:

They're errors that I really don't know how to help you with regardless, as I never came across them myself, and they simply do not happen on my end.
Plus, I do not know the exact steps that you are doing on your end.

The only thing I can suggest you is to start from scratch.
EDIT: Oh yeah, if you actually used git clone in the terminal/shell of maybe Git for Windows, you utilized a GUI for Git at any point at all, I highly suggest you not to do that.

Okay, thanks for explaining, and sorry for commenting in the wrong place.