Emulation/nimbus
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/nimbus.git synced 2024-06-01 03:27:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix many much bigger mistakes

Browse source
This commit is contained in:
Pancake-Pal-Productions 2024-04-07 14:53:46 -04:00
parent 1fe845bb51
commit d40a6cfe5c
4 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/source/common.hpp
View file

@ -34,19 +34,19 @@ const int GetSystemInfoCFW = 0x10000; // the type for Luma3DS' GetSystemInfo hoo
const u32 defaultColor = C2D_Color32(255, 255, 255, 0xFF);
struct MainStruct {
C2D_Sprite *debug_button;
C2D_Sprite *debug_header;
C2D_Sprite *go_back;
C2D_Sprite *header;
C2D_Sprite *nintendo_unloaded_deselected;
C2D_Sprite *nintendo_unloaded_selected;
C2D_Sprite *nintendo_loaded_selected;
C2D_Sprite *nintendo_loaded_deselected;
C2D_Sprite *pretendo_unloaded_deselected;
C2D_Sprite *pretendo_unloaded_selected;
C2D_Sprite *pretendo_loaded_selected;
C2D_Sprite *pretendo_loaded_deselected;
C2D_Sprite *top;
C2D_Sprite debug_button;
C2D_Sprite debug_header;
C2D_Sprite go_back;
C2D_Sprite header;
C2D_Sprite nintendo_unloaded_deselected;
C2D_Sprite nintendo_unloaded_selected;
C2D_Sprite nintendo_loaded_selected;
C2D_Sprite nintendo_loaded_deselected;
C2D_Sprite pretendo_unloaded_deselected;
C2D_Sprite pretendo_unloaded_selected;
C2D_Sprite pretendo_loaded_selected;
C2D_Sprite pretendo_loaded_deselected;
C2D_Sprite top;
u32 screen = 0;
u32 state = 0;

53
app/source/main.cpp
View file

@ -15,29 +15,29 @@ MainStruct mainStruct = MainStruct();
static void sceneInit(void)
{
C2D_SpriteSheet spriteSheet = C2D_SpriteSheetLoadFromMem(sheet_t3x, sheet_t3x_size);
C2D_SpriteFromSheet(mainStruct.top, spriteSheet, sheet_top_idx);
C2D_SpriteFromSheet(mainStruct.go_back, spriteSheet, sheet_go_back_idx);
C2D_SpriteFromSheet(mainStruct.header, spriteSheet, sheet_header_idx);
C2D_SpriteFromSheet(mainStruct.nintendo_unloaded_deselected, spriteSheet, sheet_nintendo_unloaded_deselected_idx);
C2D_SpriteFromSheet(mainStruct.nintendo_unloaded_selected, spriteSheet, sheet_nintendo_unloaded_selected_idx);
C2D_SpriteFromSheet(mainStruct.nintendo_loaded_selected, spriteSheet, sheet_nintendo_loaded_selected_idx);
C2D_SpriteFromSheet(mainStruct.nintendo_loaded_deselected, spriteSheet, sheet_nintendo_loaded_deselected_idx);
C2D_SpriteFromSheet(mainStruct.pretendo_unloaded_deselected, spriteSheet, sheet_pretendo_unloaded_deselected_idx);
C2D_SpriteFromSheet(mainStruct.pretendo_unloaded_selected, spriteSheet, sheet_pretendo_unloaded_selected_idx);
C2D_SpriteFromSheet(mainStruct.pretendo_loaded_selected, spriteSheet, sheet_pretendo_loaded_selected_idx);
C2D_SpriteFromSheet(mainStruct.pretendo_loaded_deselected, spriteSheet, sheet_pretendo_loaded_deselected_idx);
C2D_SpriteSetCenter(mainStruct.top, 0.49f, 0.49f);
C2D_SpriteSetPos(mainStruct.top, 400/2, 240/2);
C2D_SpriteSetPos(mainStruct.go_back, 0, 214);
C2D_SpriteSetPos(mainStruct.header, 95, 14);
C2D_SpriteSetPos(mainStruct.pretendo_loaded_selected, 49, 59);
C2D_SpriteSetPos(mainStruct.pretendo_unloaded_selected, 49, 59);
C2D_SpriteSetPos(mainStruct.pretendo_unloaded_deselected, 49, 59);
C2D_SpriteSetPos(mainStruct.pretendo_loaded_deselected, 49, 59);
C2D_SpriteSetPos(mainStruct.nintendo_loaded_selected, 165, 59);
C2D_SpriteSetPos(mainStruct.nintendo_unloaded_selected, 165, 59);
C2D_SpriteSetPos(mainStruct.nintendo_unloaded_deselected, 165, 59);
C2D_SpriteSetPos(mainStruct.nintendo_loaded_deselected, 165, 59);
C2D_SpriteFromSheet(&mainStruct.top, spriteSheet, sheet_top_idx);
C2D_SpriteFromSheet(&mainStruct.go_back, spriteSheet, sheet_go_back_idx);
C2D_SpriteFromSheet(&mainStruct.header, spriteSheet, sheet_header_idx);
C2D_SpriteFromSheet(&mainStruct.nintendo_unloaded_deselected, spriteSheet, sheet_nintendo_unloaded_deselected_idx);
C2D_SpriteFromSheet(&mainStruct.nintendo_unloaded_selected, spriteSheet, sheet_nintendo_unloaded_selected_idx);
C2D_SpriteFromSheet(&mainStruct.nintendo_loaded_selected, spriteSheet, sheet_nintendo_loaded_selected_idx);
C2D_SpriteFromSheet(&mainStruct.nintendo_loaded_deselected, spriteSheet, sheet_nintendo_loaded_deselected_idx);
C2D_SpriteFromSheet(&mainStruct.pretendo_unloaded_deselected, spriteSheet, sheet_pretendo_unloaded_deselected_idx);
C2D_SpriteFromSheet(&mainStruct.pretendo_unloaded_selected, spriteSheet, sheet_pretendo_unloaded_selected_idx);
C2D_SpriteFromSheet(&mainStruct.pretendo_loaded_selected, spriteSheet, sheet_pretendo_loaded_selected_idx);
C2D_SpriteFromSheet(&mainStruct.pretendo_loaded_deselected, spriteSheet, sheet_pretendo_loaded_deselected_idx);
C2D_SpriteSetCenter(&mainStruct.top, 0.49f, 0.49f);
C2D_SpriteSetPos(&mainStruct.top, 400/2, 240/2);
C2D_SpriteSetPos(&mainStruct.go_back, 0, 214);
C2D_SpriteSetPos(&mainStruct.header, 95, 14);
C2D_SpriteSetPos(&mainStruct.pretendo_loaded_selected, 49, 59);
C2D_SpriteSetPos(&mainStruct.pretendo_unloaded_selected, 49, 59);
C2D_SpriteSetPos(&mainStruct.pretendo_unloaded_deselected, 49, 59);
C2D_SpriteSetPos(&mainStruct.pretendo_loaded_deselected, 49, 59);
C2D_SpriteSetPos(&mainStruct.nintendo_loaded_selected, 165, 59);
C2D_SpriteSetPos(&mainStruct.nintendo_unloaded_selected, 165, 59);
C2D_SpriteSetPos(&mainStruct.nintendo_unloaded_deselected, 165, 59);
C2D_SpriteSetPos(&mainStruct.nintendo_loaded_deselected, 165, 59);
textBuf = C2D_TextBufNew(4096); // initialize the text buffer with a max glyph count of 4096
}
@ -71,13 +71,6 @@ int main()
mainStruct.buttonSelected = static_cast<NascEnvironment>(serverTypes[0]);
mainStruct.currentAccount = mainStruct.buttonSelected;
// if running on citra, skip all luma checks
s64 isCitra = 0;
svcGetSystemInfo(&isCitra, 0x20000, 0);
if (isCitra) {
mainStruct.state = 1;
}
// Main loop
while (aptMainLoop()) {
u32 exit = 0;

9
app/source/states/LumaValidation.cpp
View file

@ -10,6 +10,15 @@ bool LumaValidation::checkIfLumaOptionsEnabled(MainStruct *mainStruct, C3D_Rende
C2D_SceneBegin(bottom_screen);
// if running on citra, skip all luma checks
s64 isCitra = 0;
svcGetSystemInfo(&isCitra, 0x20000, 0);
if (isCitra) {
mainStruct->state = 1;
return false;
}
// if this is the first time the function has been run, get luma information
if (mainStruct->firstRunOfState) {
mainStruct->firmwareVersion = GetSystemInfoField(GetSystemInfoCFW, CFWSystemInfoField::FirmwareVersion);

20
app/source/states/MainUI.cpp
View file

@ -44,31 +44,31 @@ bool MainUI::drawUI(MainStruct *mainStruct, C3D_RenderTarget* top_screen, C3D_Re
C2D_SceneBegin(top_screen);
DrawVersionString();
C2D_DrawSprite(mainStruct->top);
C2D_DrawSprite(&mainStruct->top);
C2D_SceneBegin(bottom_screen);
if (mainStruct->buttonSelected == NascEnvironment::NASC_ENV_Prod) {
if (mainStruct->currentAccount == NascEnvironment::NASC_ENV_Prod) {
C2D_DrawSprite(mainStruct->nintendo_loaded_selected);
C2D_DrawSprite(mainStruct->pretendo_unloaded_deselected);
C2D_DrawSprite(&mainStruct->nintendo_loaded_selected);
C2D_DrawSprite(&mainStruct->pretendo_unloaded_deselected);
}
else {
C2D_DrawSprite(mainStruct->nintendo_unloaded_selected);
C2D_DrawSprite(mainStruct->pretendo_loaded_deselected);
C2D_DrawSprite(&mainStruct->nintendo_unloaded_selected);
C2D_DrawSprite(&mainStruct->pretendo_loaded_deselected);
}
}
else if (mainStruct->buttonSelected == NascEnvironment::NASC_ENV_Test) {
if (mainStruct->currentAccount == NascEnvironment::NASC_ENV_Test) {
C2D_DrawSprite(mainStruct->nintendo_unloaded_deselected);
C2D_DrawSprite(mainStruct->pretendo_loaded_selected);
C2D_DrawSprite(&mainStruct->nintendo_unloaded_deselected);
C2D_DrawSprite(&mainStruct->pretendo_loaded_selected);
}
else {
C2D_DrawSprite(mainStruct->nintendo_loaded_deselected);
C2D_DrawSprite(mainStruct->pretendo_unloaded_selected);
C2D_DrawSprite(&mainStruct->nintendo_loaded_deselected);
C2D_DrawSprite(&mainStruct->pretendo_unloaded_selected);
}
}
C2D_DrawSprite(mainStruct->header);
C2D_DrawSprite(&mainStruct->header);
// handle touch input
if (kDown & KEY_TOUCH) {