Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional Country Filters #1456

Merged
merged 3 commits into from Nov 20, 2014
Merged

Additional Country Filters #1456

merged 3 commits into from Nov 20, 2014

Conversation

Stevoisiak
Copy link
Contributor

No description provided.

@PatrickFerry
Copy link
Contributor

Typo fliters -> filters in title.

@Stevoisiak Stevoisiak changed the title Fixed country fliters Fixed country filters Nov 1, 2014
@phire
Copy link
Member

phire commented Nov 2, 2014

@dolphin-emu-bot rebuild

1 similar comment
@Stevoisiak
Copy link
Contributor Author

@dolphin-emu-bot rebuild

comex
comex reviewed Nov 2, 2014
View reviewed changes
Source/Core/Core/CoreParameter.cpp
//case DiskIO::IVolume::COUNTRY_INTERNATIONAL:
//case DiscIO::IVolume::COUNTRY_SDK:
//case DiscIO::IVolume::COUNTRY_UNKNOWN:
// TODO: Separate Region Dir for regionless games?

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@Stevoisiak Stevoisiak force-pushed the AddCountries branch 2 times, most recently from ba1298c to 121abca Compare November 3, 2014 19:23
@Stevoisiak
Copy link
Contributor Author

Tried to squash everything together in a way that made sense. Let me know if I need to squash anything else together for a merge.

@Stevoisiak Stevoisiak changed the title Fixed country filters WIP: Additional Country and Platform Filters Nov 6, 2014
@waddlesplash
Copy link
Contributor

Any reason this can't be merged? @lioncash

@Stevoisiak
Copy link
Contributor Author

Hold off on merging. I'm currently working on adding one more country flag, as well as updating a few Qt references.

@Stevoisiak Stevoisiak changed the title WIP: Additional Country and Platform Filters WIP: Additional Country Filters Nov 7, 2014
JosJuice
JosJuice reviewed Nov 7, 2014
View reviewed changes
Source/Core/DiscIO/VolumeCommon.cpp
@@ -17,22 +17,20 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
{
// Region free - fall through to European defaults for now

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@waddlesplash
Copy link
Contributor

LGTM. @lioncash probably should go over one last time before merging.

@Stevoisiak
Copy link
Contributor Author

@waddlesplash I don't want to merge this yet. Hence the WIP in the title.

@waddlesplash
Copy link
Contributor

@Stevoisiak what's left to do?

@Stevoisiak
Copy link
Contributor Author

@waddlesplash The guy who runs GameTDB told me that the H country code was used by some games from the Netherlands, so I still need to add a flag for that.

In addition, I want to do a bit of research on the X, Y, and Z country codes.

@Stevoisiak Stevoisiak force-pushed the AddCountries branch 2 times, most recently from 0084d23 to ff8b3c7 Compare November 11, 2014 19:51
@waddlesplash
Copy link
Contributor

@Stevoisiak this is done now, right?

@Stevoisiak
Copy link
Contributor Author

@waddlesplash Unless someone has a flag I can use for region-free/International titles, then yes, I am done.

@waddlesplash
Copy link
Contributor

That can probably be saved for another PR I guess. LGTM, @lioncash can you merge?

@waddlesplash
Copy link
Contributor

Oh wait, don't merge this -- @Stevoisiak since you changed the country filters you need to bump the cache revision (in ISOFile.cpp) [also might wanna put a comment on the ECountry definition that reminds people they must bump the cache revision if they change it].

@Stevoisiak
Various country flag improvements
f1a26ff 
* Added country flags for games from Netherlands and Spain
* Added separate category for Region Free games (Uses European flag as placeholder)
* Added missing country filter options in "show regions" menu
* Rearranged country filters for readability
* Incremented CACHE_REVISION

Also fixed various country filters not showing up as options in the "Show regions" menu.
@Stevoisiak
Removed SDK flag
695bbac 
SDK is not an official Nintendo country code, and is not actually used
by any official software.
@Stevoisiak
Converted country flags for DolphinQt
64f6d91
@Stevoisiak Stevoisiak mentioned this pull request Nov 19, 2014
Closed
@Stevoisiak Stevoisiak changed the title WIP: Additional Country Filters Additional Country Filters Nov 19, 2014
Stevoisiak
Stevoisiak reviewed Nov 19, 2014
View reviewed changes
Source/Core/DolphinWX/ISOFile.cpp
@@ -37,7 +37,7 @@
#include "DolphinWX/ISOFile.h"
#include "DolphinWX/WxUtils.h"

static const u32 CACHE_REVISION = 0x115;
static const u32 CACHE_REVISION = 0x117;

This comment was marked as off-topic.

Sign in to view

@waddlesplash
Copy link
Contributor

@Stevoisiak says this is ready to go. @lioncash, will you do the honors?

lioncash added a commit that referenced this pull request Nov 20, 2014
@lioncash
Merge pull request #1456 from Stevoisiak/AddCountries
ccebac8 
Additional Country Filters
@lioncash lioncash merged commit ccebac8 into dolphin-emu:master Nov 20, 2014
@PatrickFerry
Copy link
Contributor

Hey @Stevoisiak How would I make or get .xpm flags.

I'm going to make a commit of a missing country...

@Stevoisiak
Copy link
Contributor Author

@ZephyrSurfer What country is missing?

@PatrickFerry
Copy link
Contributor

@Stevoisiak that would be sweden.

@Stevoisiak
Copy link
Contributor Author

@ZephyrSurfer I'm pretty sure there isn't a region code for games from Sweden, but I could easily be wrong. We identify a game's country with the region code, which is the 4th digit of the GameID. An incomplete list of region codes can be found on WiiBrew.org
http://wiibrew.org/wiki/Title_database#Region_Codes

@PatrickFerry
Copy link
Contributor

@Stevoisiak Yeah I know. There is some for example. one sec

Edit: Here, here: http://www.gametdb.com/Wii/GAZM69

Edit 2: and that list says the X region is wiiware/ virtual console. However there are retail gamecube games with it. So not only incomplete it is also inaccurate.

@PatrickFerry
Copy link
Contributor

Bump
@Stevoisiak Have you found anything else about it.
Unfortunately There aren't many other swedish only region titles apart from one other Harry Potter game. But I imagine there has to be others and they are just absent from GameTDB?

Edit: how do import games even have different GameIDs?

@Stevoisiak
Copy link
Contributor Author

@ZephyrSurfer
I haven't done any research on this for a while.
I'm confused what you are trying to say. We currently identify games with the "M" country code as being European games. Are you saying the "M" country code is only used for games from Sweden?

@PatrickFerry
Copy link
Contributor

@Stevoisiak Yes, that's what I'm saying.
I don't know of any other games released in Swedish only but I'd imagine there are. If even only the rest of Harry Potter.
But the only 2 games that use it(on GameTDB) are Swedish only. There are a few "Custom" games that use it though.

@Stevoisiak
Copy link
Contributor Author

@ZephyrSurfer I just looked through GameTDB. Identifying the 'M' country code as Swedish games doesn't work. While the two Swedish Harry Potter games are the only GameCube games using the 'M' country code, unfortunately there are a few PAL virtual console games that use the M country code.
http://www.gametdb.com/Wii/FBNM
http://www.gametdb.com/Wii/JCBM
http://www.gametdb.com/Wii/JCDM

@PatrickFerry
Copy link
Contributor

@Stevoisiak Oh well, I just checked it against the 6 letter GameID.
Thanks for looking into it though.

@Stevoisiak Stevoisiak deleted the AddCountries branch December 8, 2014 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
8 participants
@Stevoisiak @PatrickFerry @phire @waddlesplash @comex @lioncash @JosJuice @Buddybenj