Skip to content

Commit 8bd9fe5

Browse files
SuperSaiyajinStackZSuperSaiyajinStackZ
committed
Add support for Japanese NDS region.
Also change SuperSaiyajinStackZ to Sim2Team.
1 parent 443d6f3 commit 8bd9fe5

42 files changed

Lines changed: 168 additions & 105 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
# Sim2Editor-Core
2-
Sim2Editor's C++ Core written by SuperSaiyajinStackZ.
3-
4-
This Core is being used for [Sim2Editor](https://github.com/Universal-Team/Sim2Editor)'s 3DS and NDS version. I decided to do the Core External, so other apps can make use of this as well, if needed for whatever reason.
1+
# Sim2Editor-CPPCore
2+
Sim2Editor's C++ Core is written by Sim2Team, but mainly by SuperSaiyajinStackZ.
53

64
## Core Usage
75
For that, look at the coming soon:tm: wiki. It will also contain documentation about each Core function, so you can see what you'd need.
86

97
## Credits
10-
- [SuperSaiyajinStackZ](https://github.com/SuperSaiyajinStackZ): Main Developer of the Core + Main SAV Researcher.
11-
- [Universal-Team](https://github.com/Universal-Team): Since i'm part of Universal-Team, also the Credits / Copyright goes to Universal-Team.
8+
- [SuperSaiyajinStackZ](https://github.com/SuperSaiyajinStackZ): Main Developer of the Core + Main Sav Researcher.
129

1310

1411
Licensing:

‎include/Strings.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎include/gba/GBACast.hpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -30,13 +30,11 @@
3030
#include "../shared/CoreCommon.hpp"
3131

3232
namespace S2Editor {
33-
enum class GBACastPicture : uint8_t { Neutral, Friendly, Angry, Love, Invalid };
33+
enum class GBACastFeeling : uint8_t { Neutral, Friendly, Angry, Love, Invalid };
3434

3535
class GBACast {
3636
public:
37-
GBACast(const uint32_t Offs, const uint8_t Cast)
38-
: Cast(Cast), Offs(Offs) { };
39-
37+
GBACast(const uint32_t Offs, const uint8_t Cast) : Cast(Cast), Offs(Offs) { };
4038
uint8_t Index() const { return this->Cast; };
4139

4240
/* Conversation Levels. */
@@ -47,12 +45,16 @@ namespace S2Editor {
4745
uint8_t Intimidate() const;
4846
void Intimidate(const uint8_t V);
4947

50-
GBACastPicture Picture() const;
51-
void Picture(const GBACastPicture V);
48+
GBACastFeeling Feeling() const;
49+
void Feeling(const GBACastFeeling V);
50+
uint8_t FeelingEffectHours() const;
51+
void FeelingEffectHours(const uint8_t V);
5252

5353
/* Unlockables. */
54-
bool Mystery() const;
55-
void Mystery(const bool V);
54+
bool RegisteredOnPhone() const;
55+
void RegisteredOnPhone(const bool V);
56+
bool Secret() const;
57+
void Secret(const bool V);
5658
private:
5759
uint8_t Cast = 0;
5860
uint32_t Offs = 0;

‎include/gba/GBAEpisode.hpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -32,9 +32,7 @@
3232
namespace S2Editor {
3333
class GBAEpisode {
3434
public:
35-
GBAEpisode(const uint8_t Slot, const uint8_t Episode, const uint8_t Move = 0x0)
36-
: Episode(Episode), Offs((Slot * 0x1000) + this->SetOffset(std::min<uint8_t>(Move, 10))) { };
37-
35+
GBAEpisode(const uint8_t Slot, const uint8_t Episode, const uint8_t Move = 0x0) : Episode(Episode), Offs((Slot * 0x1000) + this->SetOffset(std::min<uint8_t>(Move, 10))) { };
3836
uint8_t Index() const { return this->Episode; };
3937

4038
uint8_t Rating(const uint8_t Category) const;

‎include/gba/GBAHouse.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎include/gba/GBAHouseItem.hpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -37,11 +37,7 @@
3737
*/
3838
namespace S2Editor {
3939
enum class GBAHouseItemDirection : uint8_t {
40-
Right = 0x1,
41-
Down = 0x3,
42-
Left = 0x5,
43-
Up = 0x7,
44-
Invalid = 0xFF
40+
Right = 0x1, Down = 0x3, Left = 0x5, Up = 0x7, Invalid = 0xFF
4541
};
4642

4743
class GBAHouseItem {

‎include/gba/GBAItem.hpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
3636
The GBAItem class can be moreso seen as like a package of 6 Items.
3737
The Pawnshop, Saloon, Skillbook seller, Mailbox and the Inventory have 6 Item Slots.
3838
The first byte contains the Item Count, while the following things contain the item data.
39-
It still needs to be a bit more researched though, because there is still 0x3 of 0x4 bytes unresearched of the Item.
4039
4140
0xE6 is known as an Empty Item ID.
4241
*/
@@ -50,6 +49,12 @@ namespace S2Editor {
5049

5150
uint8_t ID(const uint8_t Index) const;
5251
void ID(const uint8_t Index, const uint8_t V);
52+
53+
/* Flag and Use count. */
54+
uint8_t Flag(const uint8_t Idx) const;
55+
void Flag(const uint8_t Idx, const uint8_t V);
56+
uint8_t UseCount(const uint8_t Idx) const;
57+
void UseCount(const uint8_t Idx, const uint8_t V);
5358
private:
5459
uint32_t Offs = 0;
5560
};

‎include/gba/GBAMinigame.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎include/gba/GBASav.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎include/gba/GBASettings.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Sim2Editor-CPPCore
3-
* Copyright (C) 2020-2021 SuperSaiyajinStackZ, Universal-Team
3+
* Copyright (C) 2020-2021 Sim2Team
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)