diff options
| -rw-r--r-- | backends/platform/ds/arm7/source/main.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 30 |
2 files changed, 6 insertions, 26 deletions
diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp index 7029d96405..0e8dd9efeb 100644 --- a/backends/platform/ds/arm7/source/main.cpp +++ b/backends/platform/ds/arm7/source/main.cpp @@ -585,7 +585,7 @@ int main(int argc, char ** argv) { //enable sound // powerOn(POWER_SOUND); - SOUND_CR = SOUND_ENABLE | SOUND_VOL(0x7F); + REG_SOUNDCNT = SOUND_ENABLE | SOUND_VOL(0x7F); IPC->soundData = 0; IPC->reset = false; diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index ca2d2cb855..6ba19cc053 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -619,25 +619,17 @@ void displayMode8Bit() { SUB_BG3_CR = BG_BMP8_512x256; SUB_BG3_XDX = (int) (subScreenWidth / 256.0f * 256); - SUB_BG3_XDY = 0; - SUB_BG3_YDX = 0; + SUB_BG3_XDY = 0; + SUB_BG3_YDX = 0; SUB_BG3_YDY = (int) (subScreenHeight / 192.0f * 256); - if (consoleEnable) - { + if (consoleEnable) { consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 2, 0, true); - // Move the cursor to the bottom of the screen using ANSI escape code consolePrintf("\033[23;0f"); } -// consoleInitDefault((u16*)SCREEN_BASE_BLOCK(2), (u16*)CHAR_BASE_BLOCK(0), 16); -// consoleSetWindow(NULL, 0, 0, 32, 24); -// consolePrintSet(0, 23); -/* while (1) { - printf("Hello world"); - }*/ for (int r = 0; r < 32 * 32; r++) { @@ -660,9 +652,6 @@ void displayMode8Bit() { // PALETTE_SUB[255] = savedPalEntry255; - - - #ifdef HEAVY_LOGGING consolePrintf("done\n"); #endif @@ -1564,10 +1553,6 @@ void addEventsToQueue() { } } - - - - } @@ -1593,8 +1578,6 @@ void addEventsToQueue() { showOptionsDialog(); } } - - } if (!getIndyFightState() && !((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) && (getKeysDown() & KEY_X)) { @@ -1608,12 +1591,9 @@ void addEventsToQueue() { if (!keyboardEnable) { - if ((tapScreenClicks) && (getIsDisplayMode8Bit())) - { + if ((tapScreenClicks) && (getIsDisplayMode8Bit())) { doScreenTapMode(system); - } - else - { + } else { doButtonSelectMode(system); } |