Skip to content
This repository has been archived by the owner on Feb 27, 2022. It is now read-only.

Commit

Permalink
Last fixes for now.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SuperSaiyajinStackZ
SuperSaiyajinStackZ committed Sep 5, 2020
1 parent 037eec4 commit abdeb7d
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 43 deletions.
1 change: 0 additions & 1 deletion 3ds/assets/gfx/gui.t3s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ gui/button_corner.png
gui/box_top.png
gui/cross.png
gui/dev_by.png
gui/discord.png
gui/itemHole.png
gui/noTPC.png
gui/pattern-editor.png
Expand Down
Binary file removed 3ds/assets/gfx/gui/discord.png
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions 3ds/include/screens/nl/villagerEditorNL.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class VillagerEditorNL : public Screen {
{15, 34, 102, 20, "VILLAGER_REPLACE"}, // Replace.
{15, 97, 102, 20, "VILLAGER_PERSONALITY"}, // Personality.
{15, 159, 102, 20, "ITEMS"}, // Items.
{175, 34, 102, 20, "VILLAGER_CATCHPHRASE"}, // Catchphrase.
{175, 97, 102, 20, "VILLAGER_STATUS"}, // Status.
{175, 34, 102, 20, ""}, // Catchphrase.
{175, 97, 102, 20, ""}, // Status.
{175, 159, 102, 20, ""} // ?.
};

Expand Down
4 changes: 2 additions & 2 deletions 3ds/include/screens/ww/villagerEditorWW.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class VillagerEditorWW : public Screen {
{15, 34, 102, 20, "VILLAGER_REPLACE"}, // Replace.
{15, 97, 102, 20, "VILLAGER_PERSONALITY"}, // Personality.
{15, 159, 102, 20, "ITEMS"}, // Items.
{175, 34, 102, 20, "VILLAGER_CATCHPHRASE"}, // Catchphrase.
{175, 97, 102, 20, "VILLAGER_STATUS"}, // Status.
{175, 34, 102, 20, ""}, // Catchphrase.
{175, 97, 102, 20, ""}, // Status.
{175, 159, 102, 20, ""} // ?.
};

Expand Down
49 changes: 16 additions & 33 deletions 3ds/source/overlay/creditsOverlay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,21 @@ static void Draw(int page) {
C2D_TargetClear(Top, C2D_Color32(0, 0, 0, 0));
C2D_TargetClear(Bottom, C2D_Color32(0, 0, 0, 0));

/* 2 -> QR Code. */
if (page != 2) {
GFX::DrawTop();
GFX::DrawGUI(gui_bottom_bar_idx, 0, 209);
Gui::DrawStringCentered(0, -2, 0.9f, WHITE, "LeafEdit - " + Lang::get("CREDITS"), 400, 0, font);
Gui::DrawStringCentered(0, 30, 0.9f, BLACK, Lang::get("DEVELOPED_BY"), 390, 0, font);
Gui::DrawStringCentered(0, 50, 0.9f, BLACK, Lang::get("MAIN_DEV"), 390, 0, font);
GFX::DrawGUI(gui_stackz_idx, 5, 74);
GFX::DrawGUI(gui_universal_core_idx, 200, 110);
Gui::DrawString(395-Gui::GetStringWidth(0.8, Lang::get("CURRENT_VERSION") + V_STRING, font), 218, 0.8, WHITE, Lang::get("CURRENT_VERSION") + V_STRING, 400, 0, font);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha));
GFX::DrawTop();
GFX::DrawGUI(gui_bottom_bar_idx, 0, 209);
Gui::DrawStringCentered(0, -2, 0.9f, WHITE, "LeafEdit - " + Lang::get("CREDITS"), 400, 0, font);
Gui::DrawStringCentered(0, 30, 0.9f, BLACK, Lang::get("DEVELOPED_BY"), 390, 0, font);
Gui::DrawStringCentered(0, 50, 0.9f, BLACK, Lang::get("MAIN_DEV"), 390, 0, font);
GFX::DrawGUI(gui_stackz_idx, 5, 74);
GFX::DrawGUI(gui_universal_core_idx, 200, 110);
Gui::DrawString(395-Gui::GetStringWidth(0.8, Lang::get("CURRENT_VERSION") + V_STRING, font), 218, 0.8, WHITE, Lang::get("CURRENT_VERSION") + V_STRING, 400, 0, font);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha));

GFX::DrawBottom();
GFX::DrawGUI(gui_top_bar_idx, 0, 0);
GFX::DrawGUI(gui_bottom_bar_idx, 0, 209);
GFX::DrawBottom();
GFX::DrawGUI(gui_top_bar_idx, 0, 0);
GFX::DrawGUI(gui_bottom_bar_idx, 0, 209);

Gui::DrawStringCentered(0, 219, 0.8f, WHITE, Lang::get("CURRENT_PAGE") + std::to_string(page + 1) + " | 3", 310, 0, font);
}
Gui::DrawStringCentered(0, 219, 0.8f, WHITE, Lang::get("CURRENT_PAGE") + std::to_string(page + 1) + " | 1", 310, 0, font);

/* Credits Pages. */
if (page == 0) {
Expand All @@ -64,22 +61,6 @@ static void Draw(int page) {
Gui::DrawStringCentered(0, 148, 0.7f, BLACK, Lang::get("HELPING_OUT_PROBLEMS"), 310, 0, font);
Gui::DrawStringCentered(0, 178, 0.8f, BLACK, "TotallyNotGuy", 310, 0, font);
Gui::DrawStringCentered(0, 198, 0.7f, BLACK, Lang::get("GRAPHIC_WORK"), 310, 0, font);

} else if (page == 1) {
Gui::DrawStringCentered(0, -2, 0.8f, WHITE, Lang::get("TRANSLATORS"), 310, 0, font);
Gui::DrawString(5, 45, 0.8f, BLACK, "Deutsch\nEnglish\nEspañol\nFrançais\nItaliano\nLietuvių\nPortuguês\n日本語", 310, 0, font);
Gui::DrawString(150, 45, 0.8f, BLACK, "SuperSaiyajinStackZ\nSuperSaiyajinStackZ\nYoSoy\nantoine62\nedo9300\nlemonnade0\nChips, David Pires\nPk11", 310, 0, font);
}

if (page == 2) {
GFX::DrawTop();
Gui::Draw_Rect(0, 0, 400, 240, DIM);
GFX::DrawGUI(gui_discord_idx, 115, 35);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha));
GFX::DrawBottom();
Gui::Draw_Rect(0, 0, 320, 240, DIM);
Gui::DrawStringCentered(0,-2, 0.8f, WHITE, Lang::get("CURRENT_PAGE") + std::to_string(page + 1) + " | 3", 310, 0, font);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 320, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha));
}

C3D_FrameEnd(0);
Expand All @@ -94,13 +75,15 @@ void Overlays::showCredits() {
u32 hDown = hidKeysDown();
hidScanInput();

/*
if (hDown & KEY_RIGHT) {
if (page < 2) page++;
if (page < 1) page++;
}
if (hDown & KEY_LEFT) {
if (page > 0) page--;
}
*/

if (hDown & KEY_B) doOut = true;
}
Expand Down
2 changes: 1 addition & 1 deletion 3ds/source/screens/nl/playerEditorNL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ void PlayerEditorNL::PlayerLogic(u32 hDown, u32 hHeld, touchPosition touch) {
this->player->islandmedals((u32)Input::setInt(9999, "Enter medal amount.", 4, this->player->islandmedals()));


} else if (touching(touch, this->playerButtons[2])) {
} else if (touching(touch, this->playerButtons[3])) {
if (savesType == SaveType::WA) {
this->player->coupons((u32)Input::setInt(9999, "Enter coupon amount.", 4, this->player->coupons()));
}
Expand Down
2 changes: 1 addition & 1 deletion 3ds/source/screens/nl/townMapEditorNL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void TownMapEditorNL::DrawMapScreen(void) const {
this->DrawCurrentPos();

/* Draw the Operation Buttons. */
for (int i = 0; i < 4; i++) {
for (int i = 0; i < 3; i++) {
GFX::DrawButton(mainButtons[i], 0.6f);
}

Expand Down
2 changes: 1 addition & 1 deletion 3ds/source/screens/nl/villagerEditorNL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void VillagerEditorNL::DrawSubMenu(void) const {
Gui::DrawStringCentered(0, 100, 0.9f, BLACK, Lang::get("VILLAGER_NAME") + std::get<1>(villagerDB[this->villager->id()]), 395, 0, font);

Gui::DrawStringCentered(0, 130, 0.9f, BLACK, Lang::get("VILLAGER_PERSONALITY") + ": " + getPersonality(this->villager->personality()), 395, 0, font);
Gui::DrawStringCentered(0, 160, 0.9f, BLACK, Lang::get("VILLAGER_CATCHPHRASE") + ": ", 395, 0, font);
//Gui::DrawStringCentered(0, 160, 0.9f, BLACK, Lang::get("VILLAGER_CATCHPHRASE") + ": ", 395, 0, font);

if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha));
GFX::DrawBottom();
Expand Down
2 changes: 1 addition & 1 deletion 3ds/source/screens/ww/townMapEditorWW.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ void TownMapEditorWW::DrawMapScreen(void) const {
this->DrawCurrentPos();

/* Draw the Operation Buttons. */
for (int i = 0; i < 4; i++) {
for (int i = 0; i < 3; i++) {
GFX::DrawButton(mainButtons[i], 0.6f);
}

Expand Down
2 changes: 1 addition & 1 deletion 3ds/source/screens/ww/villagerEditorWW.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void VillagerEditorWW::DrawSubMenu(void) const {

Gui::DrawStringCentered(0, 100, 0.9f, BLACK, Lang::get("VILLAGER_NAME") + std::get<1>(villagerDB[this->villager->id()]), 395, 0, font);
Gui::DrawStringCentered(0, 130, 0.9f, BLACK, Lang::get("VILLAGER_PERSONALITY") + ": " + getPersonality(this->villager->personality()), 395, 0, font);
Gui::DrawStringCentered(0, 160, 0.9f, BLACK, Lang::get("VILLAGER_CATCHPHRASE") + ": ", 395, 0, font);
//Gui::DrawStringCentered(0, 160, 0.9f, BLACK, Lang::get("VILLAGER_CATCHPHRASE") + ": ", 395, 0, font);

if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha));
GFX::DrawBottom();
Expand Down
Binary file modified Screenshots/mapEditorNL.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Screenshots/mapEditorWW.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Screenshots/villagerEditor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit abdeb7d

Please sign in to comment.