Fix bug where menu can't open

Author: lambertjamesd

Makefile

@@ -64,7 +64,7 @@ HFILES =	boot.h game.h controller.h font.h font_ext.h \
 		src/cpu.h              \
 		src/memory_map.h
 
-CODEFILES   =	boot.c game.c controller.c dram_stack.c \
+CODEFILES   =	boot.c game.c controller.c dram_stack.c gfxinit.c \
        src/assert.c                          \
        src/test/cpu_test.c                   \
        src/test/cpu_tests_0.c                \
@@ -117,13 +117,9 @@ CODEOBJECTS = $(patsubst %.c, build/%.o, $(CODEFILES)) build/asm/cpu.o
 
 ASMOBJECTS = $(patsubst %.s, build/%.o, $(S_FILES))
 
-DATAFILES   =	gfxinit.c
-
-DATAOBJECTS =	$(patsubst %.c, build/%.o, $(DATAFILES))
-
 CODESEGMENT =	build/codesegment.o
 
-OBJECTS =	$(CODESEGMENT) $(DATAOBJECTS) $(ASMOBJECTS) $(BOOT_OBJ) data/cgb_bios_placeholder.bin data/dmg_boot_placeholder.bin bin/rsp/ppu.o
+OBJECTS =	$(CODESEGMENT) $(ASMOBJECTS) $(BOOT_OBJ) data/cgb_bios_placeholder.bin data/dmg_boot_placeholder.bin bin/rsp/ppu.o
 
 build/asm/data.o build/asm/data_placeholder.o: data/cgb_bios_placeholder.bin data/dmg_boot_placeholder.bin
 

asm/data.s

@@ -13,6 +13,6 @@ glabel _cgb_biosSegmentRomStart
 glabel _cgb_biosSegmentRomEnd
 
 glabel _gbromSegmentRomStart
-.incbin "data/PokemonBlue.gb"
+.incbin "data/PokemonYellow.gb"
 .balign 16
 glabel _gbromSegmentRomEnd

boot.c

@@ -51,8 +51,6 @@ extern char     _codeSegmentTextStart[];
 /*
  * Symbols generated by "makerom" (ROM)
  */
-extern char     _staticSegmentRomStart[],
-                _staticSegmentRomEnd[];
 extern char     _gbromSegmentRomStart[];
 
 /*
@@ -96,8 +94,6 @@ OSIoMesg        dmaIOMessageBuf;	/* * see man page to understand this */
  * global variables
  */
 int		rdp_flag = 0;
-char		*staticSegment;
-char        *_gEndSegments;
 
 
 
@@ -193,28 +189,6 @@ static void mainproc(void *arg)
 	osCreateMesgQueue(&retraceMessageQ, retraceMessageBuf, 20);
 	osViSetEvent(&retraceMessageQ, NULL, 1);
 
-	/*
-	 * Stick the static segment right after the code/data segment
-	 */
-	staticSegment = _codeSegmentEnd;
-
-	osInvalDCache((void *)staticSegment, 
-		(u32) _staticSegmentRomEnd - (u32) _staticSegmentRomStart);
-
-
-	dmaIOMessageBuf.hdr.pri      = OS_MESG_PRI_NORMAL;
-	dmaIOMessageBuf.hdr.retQueue = &dmaMessageQ;
-	dmaIOMessageBuf.dramAddr     = staticSegment;
-	dmaIOMessageBuf.devAddr      = (u32)_staticSegmentRomStart;
-	dmaIOMessageBuf.size         = (u32)_staticSegmentRomEnd-(u32)_staticSegmentRomStart;
-
-	osEPiStartDma(handler, &dmaIOMessageBuf, OS_READ);
-
-	/*
-	 * Wait for DMA to finish
-	 */
-	(void) osRecvMesg(&dmaMessageQ, NULL, OS_MESG_BLOCK);
-
 
 #ifdef USE_DEBUGGER
 	OSThread* threads = &mainThread;
@@ -225,12 +199,6 @@ static void mainproc(void *arg)
 	}
 #endif
 
-
-	/*
-	 * Stick the texture segment right after the static segment
-	 */
-	_gEndSegments = staticSegment + 
-		(u32) _staticSegmentRomEnd - (u32) _staticSegmentRomStart;
 
 	clearDebugOutput();
 

boot.h

@@ -17,7 +17,6 @@
  *
  */
 
-#define	STATIC_SEGMENT		1
 #define	DYNAMIC_SEGMENT		3
 
 #define	SCREEN_HT	480

gb64.ld

@@ -84,13 +84,6 @@ SECTIONS
    _codeSegmentBssEnd = .;
 
    _heapStart = .;
-   
-   BEGIN_SEG(static, 0x01000000)
-   {
-      build/gfxinit.o(.data);
-      build/gfxinit.o(.bss);
-   }
-   END_SEG(static)
 
    . = 0x80200000;
 

memory.c

@@ -10,8 +10,6 @@ void* gHeapEnd;
  * Symbol genererated by "makerom" (RAM)
  */
 extern char     _heapStart[];
-extern char    *_gEndSegments;
-
 
 void initBlock(struct HeapSegment* segment, void* end, int type)
 {

render.c

@@ -62,7 +62,6 @@ void renderFrame(int clear)
     * Tell RCP where each segment is
     */
     gSPSegment(glistp++, 0, 0x0);	/* physical segment */
-    gSPSegment(glistp++, STATIC_SEGMENT, OS_K0_TO_PHYSICAL(staticSegment));
 
     gDPSetColorImage(glistp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WD, OS_K0_TO_PHYSICAL(getColorBuffer()));
 

render.h

@@ -16,7 +16,6 @@ extern OSMesgQueue
  * global variables
  */
 extern int	rdp_flag;
-extern char	*staticSegment;
 
 /*
  * frame buffer symbols

src/faulthandler.c

@@ -22,7 +22,7 @@ void installFaultHandler(OSThread *targetThread)
 	 * Create main thread
 	 */
 	osCreateThread(&faultThread, 4, faultHandlerProc, targetThread,
-		   faultThreadStack + FAULT_STACK_SIZE / sizeof(u64), 10);
+		   faultThreadStack + FAULT_STACK_SIZE / sizeof(u64), 11);
 
 	osStartThread(&faultThread);
 }
@@ -41,10 +41,19 @@ void dumpThreadInfo(OSThread *targetThread)
 static void faultHandlerProc(void* arg)
 {
     OSThread *targetThread = (OSThread*)arg;
+    OSMesgQueue timerQueue;
+    OSMesg timerMessages[10];
+    OSTimer timer;
+    
+    osCreateMesgQueue(&timerQueue, timerMessages, 10);
+    osSetTimer(&timer, 0, HANG_DELAY, &timerQueue, NULL);
 
     faultHandlerHeartbeat();
 
     while (1) {
+        OSMesg msg;
+        osRecvMesg(&timerQueue, &msg, OS_MESG_BLOCK);
+
         if (osGetTime() - lastHeartbeatTime >= HANG_DELAY) {
             DEBUG_PRINT_F("Main thread frozen:\n");
             dumpThreadInfo(targetThread);
@@ -57,8 +66,6 @@ static void faultHandlerProc(void* arg)
             DEBUG_PRINT_F("Main thread faulted:\n");
             dumpThreadInfo(curr);
             break;
-        } else {
-            osYieldThread();
         }
     }
 

src/sprite.c

@@ -2,7 +2,7 @@
 #include "sprite.h"
 #include "assert.h"
 
-#define DL_CHUNK_SIZE       16
+#define DL_CHUNK_SIZE       64
 #define SPRITE_GL_LENGTH    2098
 
 Gfx* gLayerSetup[MAX_LAYER_COUNT];