Homebrew Official Citra - New 3DS Emulator

mcdgray129

Well-Known Member
Member
Joined
May 11, 2016
Messages
116
Trophies
0
Age
41
XP
272
Country
I never tried either, so I'm not sure but I'm guessing adding the remotes to local and merging them, hoping there won't be conflicts.

edit: Yup that works!
could you give me a guide on how to do what you did mate?. id love to know how to merge and make my own builds.
 

breel

Well-Known Member
Newcomer
Joined
May 3, 2016
Messages
48
Trophies
0
Age
41
XP
68
Country
United States
could you give me a guide on how to do what you did mate?. id love to know how to merge and make my own builds.
Something along these lines:

1) git clone <citra-master>
2) cd citra
3) git remote add <reponame> <othercitrarepo>
4) git fetch <name>
5) git merge <reponame>/<branchname>
6) fix conflicts by hand as needed

repeat 3 to 6 as needed for as many branche as you need.
 

mcdgray129

Well-Known Member
Member
Joined
May 11, 2016
Messages
116
Trophies
0
Age
41
XP
272
Country
Something along these lines:

1) git clone <citra-master>
2) cd citra
3) git remote add <reponame> <othercitrarepo>
4) git fetch <name>
5) git merge <reponame>/<branchname>
6) fix conflicts by hand as needed

repeat 3 to 6 as needed for as many branche as you need.
Thank you so much dude im going to try this :-) .
 

mcdgray129

Well-Known Member
Member
Joined
May 11, 2016
Messages
116
Trophies
0
Age
41
XP
272
Country
Something along these lines:

1) git clone <citra-master>
2) cd citra
3) git remote add <reponame> <othercitrarepo>
4) git fetch <name>
5) git merge <reponame>/<branchname>
6) fix conflicts by hand as needed

repeat 3 to 6 as needed for as many branche as you need.

When you say at line 3 <OtherCitraRepo> what does this mean?.

And also at line 5 get merge ,<Reponame> <--This is the repo i want to merge with the master?? but what is <Branchname> ??

Thanks for all the help dude
 

breel

Well-Known Member
Newcomer
Joined
May 3, 2016
Messages
48
Trophies
0
Age
41
XP
68
Country
United States
When you say at line 3 <OtherCitraRepo> what does this mean?.
Well that would be the other citra git repository you're interested in (not the branch yet.)

And also at line 5 get merge ,<Reponame> <--This is the repo i want to merge with the master?? but what is <Branchname> ??
Thanks for all the help dude
Reponame is the name you gave to the repository earlier.And branchname is.... the name of the branch you're interested in!

You can find explanation for these git commands online...

For CRO for example.

that would be
git remote add cro https://github.com/Subv/citra.git
git fetch cro
git merge cro/cro

(do note the first "cro" is just a name I give to the repo locally, I could call it "ppsspp" for all it matters)
 
Last edited by breel,

Satoshi121

Well-Known Member
Newcomer
Joined
May 14, 2016
Messages
82
Trophies
0
Age
28
Location
Yorozuya odd jobs
XP
79
Country
@wwylele Why is the advancements of cemu is faster than citra ? is the 3DS more complicated than the wii u ? cemu already has stable 60fps games with really good audio, i'm under the impression that citra will be the same once @MerryMage finds time to work on https://github.com/citra-emu/citra/pull/1554 is this true and how soon can we expect this ?
 

wwylele

Well-Known Member
Member
Joined
Oct 17, 2015
Messages
151
Trophies
0
Age
28
XP
395
Country
China

masaki88

Well-Known Member
Member
Joined
Dec 9, 2014
Messages
292
Trophies
0
Age
35
Location
Bor, Novgorodskaya Oblast',
Website
www.youtube.com
XP
213
Country
Russia
could you give me a guide on how to do what you did mate?. id love to know how to merge and make my own builds.


Plus use command line like say breel

Something along these lines:

1) git clone <citra-master>
2) cd citra
3) git remote add <reponame> <othercitrarepo>
4) git fetch <name>
5) git merge <reponame>/<branchname>
6) fix conflicts by hand as needed

repeat 3 to 6 as needed for as many branche as you need.
 

DestinyFeather

Well-Known Member
Member
Joined
Sep 14, 2009
Messages
428
Trophies
1
XP
1,121
Country
United States
Got stuck in Sapph at the triple battle route 111 (did you guys even battle this by the way?)
Apparently AS and OR saves can be used interchangeably according to https://www.reddit.com/r/3dshacks/comments/40d225/converting_omega_ruby_save_to_alpha_sapphire/ so I'm going to try opening it in OR before giving up :P

EDIT
got to mauville.
Did it by by hacking my badgecount up to 8 in pkhex, setting a pokemon move to surf to bypass the triple battle and using a whole bunch of max repels. To battle May I disabled jit on the qt-vc build and then walked up to Mauville

Got my 3rd badge from Wattson :3
 
Last edited by DestinyFeather,

DestinyFeather

Well-Known Member
Member
Joined
Sep 14, 2009
Messages
428
Trophies
1
XP
1,121
Country
United States
Wait, how did you guys get past the 111 crash unless it wasn't present in Ruby? Is there a co-ordinates hack in pkhex (mine seems to be greyed out) or cheatengine hack or just a matter of using another citra version?
 

Site & Scene News

Popular threads in this forum

General chit-chat
Help Users
  • Xdqwerty
    what are you looking at?
  • BakerMan
    I rather enjoy a life of taking it easy. I haven't reached that life yet though.
    SylverReZ @ SylverReZ: @AncientBoi, https://www.youtube.com/watch?v=7jUWpmU-X8k