From 55cc54eda36d9248028ad65b53cf6c08d87dbf26 Mon Sep 17 00:00:00 2001
From: Zack Buhman <zack@buhman.org>
Date: Thu, 2 Jan 2025 17:13:57 -0600
Subject: [PATCH] re-enable boot splash

---
 Makefile.dreamcast.mk        | 3 ++-
 c/frame.c                    | 2 +-
 example/DreamcastVideo2.java | 2 --
 generate_classpath.sh        | 1 +
 java/misc/Resource.java      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.dreamcast.mk b/Makefile.dreamcast.mk
index f4b17fd..86957e0 100644
--- a/Makefile.dreamcast.mk
+++ b/Makefile.dreamcast.mk
@@ -129,7 +129,8 @@ jvm.iso: boot.bin main.bin zero.bin
 		sega/dreamcast/holly/TAVertexParameter.class \
 		sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class \
 		sega/dreamcast/holly/TextureMemoryAllocation.class \
-		java/lang/Math.class
+		java/lang/Math.class \
+		java/misc/Resource.class
 
 main.elf: LDSCRIPT = $(LIB)/main.lds
 main.elf: $(START_OBJ) $(OBJ) $(MAIN_OBJ) $(MAIN_DREAMCAST_OBJ) $(LIBGCC_OBJ) $(CLASS_PATH)
diff --git a/c/frame.c b/c/frame.c
index 5d8e4da..b9ed2f9 100644
--- a/c/frame.c
+++ b/c/frame.c
@@ -304,7 +304,7 @@ void vm_native_method_call(struct vm * vm, struct class_entry * class_entry, str
       hash_table_key_equal(method_name_constant->utf8.bytes, (const uint8_t *)"getResource", method_name_constant->utf8.length);
     if (getresource) {
       assert(nargs == 1);
-      assert(return_type == 'I');
+      assert(return_type == '[');
       uint32_t value = java_misc_resource_getresource_1(args);
       operand_stack_push_u32(vm->current_frame, value);
       return;
diff --git a/example/DreamcastVideo2.java b/example/DreamcastVideo2.java
index 93bf121..ec9e906 100644
--- a/example/DreamcastVideo2.java
+++ b/example/DreamcastVideo2.java
@@ -265,7 +265,6 @@ public class DreamcastVideo2 {
     public static void transfer_java_powered() {
         int texture = TextureMemoryAllocation.texture_regions[1][0] + 512 + (512 * 512 * 2 * 2);
 
-        /*
         // java_powered
         int[] java_powered = Resource.getResource("images/java_powered");
         int java_powered_length = (java_powered == null) ? 0 : java_powered.length;
@@ -276,7 +275,6 @@ public class DreamcastVideo2 {
             Memory.putU4(MemoryMap.texture_memory64 + texture, java_powered[i]);
             texture += 4;
         }
-        */
     }
 
     public static void boot_splash(int ta_alloc, int opb_size_total) {
diff --git a/generate_classpath.sh b/generate_classpath.sh
index 5930c87..b6b0fa0 100644
--- a/generate_classpath.sh
+++ b/generate_classpath.sh
@@ -144,6 +144,7 @@ declare -a application_classes=(
     sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class
     sega/dreamcast/holly/TextureMemoryAllocation.class
     java/lang/Math.class
+    java/misc/Resource.class
 )
 
 function application_classes () {
diff --git a/java/misc/Resource.java b/java/misc/Resource.java
index e92e2d6..a72284a 100644
--- a/java/misc/Resource.java
+++ b/java/misc/Resource.java
@@ -4,5 +4,5 @@ public class Resource {
     private Resource() {
     }
 
-    public static native int getResource(String name);
+    public static native int[] getResource(String name);
 }