#368 GBA remove mode5 support, fix 9bit sound output range

XProger · Jul 30, 2021 · b5e52c8 · b5e52c8
1 parent 1b0fbc2
commit b5e52c8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 865 deletions.
diff --git a/src/platform/gba/OpenLara.vcxproj b/src/platform/gba/OpenLara.vcxproj
@@ -36,7 +36,6 @@
     <ClInclude Include="object.h" />
     <ClInclude Include="rasterizer_mode13.h" />
     <ClInclude Include="rasterizer_mode4.h" />
-    <ClInclude Include="rasterizer_mode5.h" />
     <ClInclude Include="room.h" />
     <ClInclude Include="sound.h" />
   </ItemGroup>

diff --git a/src/platform/gba/common.h b/src/platform/gba/common.h
@@ -12,12 +12,9 @@
 
 #if defined(_WIN32)
     #define MODE4
-    //#define MODE5
     //#define MODE13
 #elif defined(__GBA__)
     #define MODE4
-    //#define MODE5
-
     //#define USE_9BIT_SOUND
 #elif defined(__TNS__)
     #define MODE13
@@ -27,10 +24,6 @@
     #error unsupported platform
 #endif
 
-#if defined(MODE5)
-    //#define DEBUG_OVERDRAW
-#endif
-
 #define NO_STATIC_MESH_PLANTS
 
 #if defined(_WIN32)
@@ -61,10 +54,6 @@
     #define VRAM_WIDTH   120 // in shorts (240 bytes)
     #define FRAME_WIDTH  240
     #define FRAME_HEIGHT 160
-#elif defined(MODE5)
-    #define VRAM_WIDTH   160
-    #define FRAME_WIDTH  120
-    #define FRAME_HEIGHT 80
 #elif defined(MODE13)
     #define MODE_PAL
     #define VRAM_WIDTH   160 // in shorts (320 bytes)
@@ -281,8 +270,8 @@ extern int32 fps;
     #define SND_DECODE(x)    ((x) - 128)
 
     #ifdef USE_9BIT_SOUND
-        #define SND_MIN          -256
-        #define SND_MAX          255
+        #define SND_MIN          -255
+        #define SND_MAX          254
     #else
         #define SND_MIN          -128
         #define SND_MAX          127

diff --git a/src/platform/gba/main.cpp b/src/platform/gba/main.cpp
@@ -550,15 +550,9 @@ int main(void) {
 
     uint16 mode = DCNT_BG2 | DCNT_PAGE;
 
-#ifdef MODE4
     mode |= DCNT_MODE4;
     REG_BG2PA = (1 << 8);
     REG_BG2PD = (1 << 8);
-#else
-    mode |= DCNT_MODE5;
-    REG_BG2PA = (1 << 7);
-    REG_BG2PD = (1 << 7);
-#endif
 
     int32 lastFrameIndex = -1;