Tinkering.

doomhack · Oct 1, 2019 · 3803e1b · 3803e1b
1 parent f3d8bf1
commit 3803e1b
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 20 deletions.
diff --git a/GBADoom.pro b/GBADoom.pro
@@ -91,7 +91,7 @@ SOURCES += \
         source/r_plane.iwram.c \
         source/r_segs.iwram.c \
         source/r_sky.c \
-        source/r_things.c \
+        source/r_things.iwram.c \
         source/s_sound.c \
         source/sounds.c \
         source/st_lib.c \

diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ MUSIC		:=
 #---------------------------------------------------------------------------------
 ARCH	:=	-mthumb -mthumb-interwork
 
-CFLAGS	:=	-g -Wall -O3\
+CFLAGS	:=	-g -Wall -O3 -fomit-frame-pointer\
 		-mcpu=arm7tdmi -mtune=arm7tdmi\
 		$(ARCH)
 

diff --git a/source/doom_iwad.c b/source/doom_iwad.c
@@ -1,4 +1,4 @@
-#include "iwad/doomu.h"
+#include "iwad/doom1.h"
 
 #include "doom_iwad.h"
 

diff --git a/source/i_system_gba.cpp b/source/i_system_gba.cpp
@@ -81,35 +81,108 @@ void I_PollWServEvents_e32()
     u16 key_down = keysDown();
 
     event_t ev;
+    ev.type = ev_keydown;
 
-    if(key_down & KEY_A)    ev.data1 = KEYD_ENTER;
-    if(key_down & KEY_UP)   ev.data1 = KEYD_UPARROW;
-    if(key_down & KEY_DOWN) ev.data1 = KEYD_DOWNARROW;
-    if(key_down & KEY_LEFT) ev.data1 = KEYD_LEFTARROW;
-    if(key_down & KEY_RIGHT)ev.data1 = KEYD_RIGHTARROW;
-    if(key_down & KEY_START)ev.data1 = KEYD_ESCAPE;
+    if(key_down & KEY_SELECT)
+    {
+        ev.data1 = KEYD_ENTER;
+        D_PostEvent(&ev);
+    }
 
+    if(key_down & KEY_UP)
+    {
+        ev.data1 = KEYD_UPARROW;
+        D_PostEvent(&ev);
+    }
 
-    ev.type = ev_keydown;
+    if(key_down & KEY_DOWN)
+    {
+        ev.data1 = KEYD_DOWNARROW;
+        D_PostEvent(&ev);
+    }
+
+    if(key_down & KEY_LEFT)
+    {
+        ev.data1 = KEYD_LEFTARROW;
+        D_PostEvent(&ev);
+    }
 
-    if(ev.data1 != 0)
+    if(key_down & KEY_RIGHT)
+    {
+        ev.data1 = KEYD_RIGHTARROW;
         D_PostEvent(&ev);
+    }
 
-    ev.data1 = 0;
+    if(key_down & KEY_START)
+    {
+        ev.data1 = KEYD_ESCAPE;
+        D_PostEvent(&ev);
+    }
 
-    u16 key_up = keysUp();
+    if(key_down & KEY_A)
+    {
+        ev.data1 = KEYD_RCTRL;
+        D_PostEvent(&ev);
+    }
 
-    if(key_up & KEY_A)    ev.data1 = KEYD_ENTER;
-    if(key_up & KEY_UP)   ev.data1 = KEYD_UPARROW;
-    if(key_up & KEY_DOWN) ev.data1 = KEYD_DOWNARROW;
-    if(key_up & KEY_LEFT) ev.data1 = KEYD_LEFTARROW;
-    if(key_up & KEY_RIGHT)ev.data1 = KEYD_RIGHTARROW;
-    if(key_up & KEY_START)ev.data1 = KEYD_ESCAPE;
+    if(key_down & KEY_B)
+    {
+        ev.data1 = KEYD_SPACEBAR;
+        D_PostEvent(&ev);
+    }
 
+
+    u16 key_up = keysUp();
     ev.type = ev_keyup;
 
-    if(ev.data1 != 0)
+    if(key_up & KEY_SELECT)
+    {
+        ev.data1 = KEYD_ENTER;
+        D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_UP)
+    {
+        ev.data1 = KEYD_UPARROW;
+        D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_DOWN)
+    {
+        ev.data1 = KEYD_DOWNARROW;
+        D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_LEFT)
+    {
+        ev.data1 = KEYD_LEFTARROW;
+        D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_RIGHT)
+    {
+        ev.data1 = KEYD_RIGHTARROW;
+        D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_START)
+    {
+        ev.data1 = KEYD_ESCAPE;
         D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_A)
+    {
+        ev.data1 = KEYD_RCTRL;
+        D_PostEvent(&ev);
+    }
+
+    if(key_up & KEY_B)
+    {
+        ev.data1 = KEYD_SPACEBAR;
+        D_PostEvent(&ev);
+    }
+
 }
 
 //**************************************************************************************

diff --git a/source/r_things.c → source/r_things.iwram.c b/source/r_things.c → source/r_things.iwram.c