Merge pull request #6 from Clownacy/master

Merge Clownacy/master into master

.gitattributes

@@ -0,0 +1,10 @@
+# Automatically normalize line endings.
+*	text=auto
+
+# MSVC files have to be CRLF
+*.vcproj	text eol=crlf
+*.sln	text eol=crlf
+
+# Do not change external files
+external/**	-text
+DoConfig/fltk/**	-text

CMakeLists.txt

@@ -160,78 +160,78 @@ add_executable(CSE2
 )
 
 set(RESOURCES
-	BITMAP/CREDIT01.bmp
-	BITMAP/CREDIT02.bmp
-	BITMAP/CREDIT03.bmp
-	BITMAP/CREDIT04.bmp
-	BITMAP/CREDIT05.bmp
-	BITMAP/CREDIT06.bmp
-	BITMAP/CREDIT07.bmp
-	BITMAP/CREDIT08.bmp
-	BITMAP/CREDIT09.bmp
-	BITMAP/CREDIT10.bmp
-	BITMAP/CREDIT11.bmp
-	BITMAP/CREDIT12.bmp
-	BITMAP/CREDIT14.bmp
-	BITMAP/CREDIT15.bmp
-	BITMAP/CREDIT16.bmp
-	BITMAP/CREDIT17.bmp
-	BITMAP/CREDIT18.bmp
+	BITMAP/Credit01.bmp
+	BITMAP/Credit02.bmp
+	BITMAP/Credit03.bmp
+	BITMAP/Credit04.bmp
+	BITMAP/Credit05.bmp
+	BITMAP/Credit06.bmp
+	BITMAP/Credit07.bmp
+	BITMAP/Credit08.bmp
+	BITMAP/Credit09.bmp
+	BITMAP/Credit10.bmp
+	BITMAP/Credit11.bmp
+	BITMAP/Credit12.bmp
+	BITMAP/Credit14.bmp
+	BITMAP/Credit15.bmp
+	BITMAP/Credit16.bmp
+	BITMAP/Credit17.bmp
+	BITMAP/Credit18.bmp
 	CURSOR/CURSOR_IKA.bmp
 	CURSOR/CURSOR_NORMAL.bmp
-	ORG/ACCESS.org
-	ORG/ANZEN.org
-	ORG/BALCONY.org
-	ORG/BALLOS.org
-	ORG/BDOWN.org
-	ORG/CEMETERY.org
-	ORG/CURLY.org
-	ORG/DR.org
-	ORG/ENDING.org
-	ORG/ESCAPE.org
-	ORG/FANFALE1.org
-	ORG/FANFALE2.org
-	ORG/FANFALE3.org
-	ORG/FIREEYE.org
-	ORG/GAMEOVER.org
-	ORG/GINSUKE.org
-	ORG/GRAND.org
-	ORG/GRAVITY.org
-	ORG/HELL.org
-	ORG/IRONH.org
-	ORG/JENKA.org
-	ORG/JENKA2.org
-	ORG/KODOU.org
-	ORG/LASTBT3.org
-	ORG/LASTBTL.org
-	ORG/LASTCAVE.org
-	ORG/MARINE.org
-	ORG/MAZE.org
-	ORG/MDOWN2.org
-	ORG/MURA.org
-	ORG/OSIDE.org
-	ORG/PLANT.org
-	ORG/QUIET.org
-	ORG/REQUIEM.org
-	ORG/TOROKO.org
-	ORG/VIVI.org
-	ORG/WANPAK2.org
-	ORG/WANPAKU.org
-	ORG/WEED.org
-	ORG/WHITE.org
+	ORG/Access.org
+	ORG/Anzen.org
+	ORG/Balcony.org
+	ORG/Ballos.org
+	ORG/BreakDown.org
+	ORG/Cemetery.org
+	ORG/Curly.org
+	ORG/Dr.org
+	ORG/Ending.org
+	ORG/Escape.org
+	ORG/Fanfale1.org
+	ORG/Fanfale2.org
+	ORG/Fanfale3.org
+	ORG/FireEye.org
+	ORG/Gameover.org
+	ORG/Ginsuke.org
+	ORG/Grand.org
+	ORG/Gravity.org
+	ORG/Hell.org
+	ORG/ironH.org
+	ORG/Jenka.org
+	ORG/Jenka2.org
+	ORG/Kodou.org
+	ORG/LastBtl3.org
+	ORG/LastBtl.org
+	ORG/LastCave.org
+	ORG/Marine.org
+	ORG/Maze.org
+	ORG/MDown2.org
+	ORG/Mura.org
+	ORG/Oside.org
+	ORG/Plant.org
+	ORG/quiet.org
+	ORG/Requiem.org
+	ORG/Toroko.org
+	ORG/Vivi.org
+	ORG/Wanpak2.org
+	ORG/Wanpaku.org
+	ORG/Weed.org
+	ORG/White.org
 	ORG/XXXX.org
-	ORG/ZONBIE.org
-	WAVE/WAVE100
+	ORG/Zonbie.org
+	WAVE/Wave.dat
 )
 
 # Handle options
 if(JAPANESE)
 	set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build_jp")
-	list(APPEND RESOURCES "BITMAP/PIXEL_JP.bmp")
+	list(APPEND RESOURCES "BITMAP/pixel_jp.bmp")
 	target_compile_definitions(CSE2 PRIVATE JAPANESE)
 else()
 	set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build_en")
-	list(APPEND RESOURCES "BITMAP/PIXEL.bmp")
+	list(APPEND RESOURCES "BITMAP/pixel.bmp")
 endif()
 
 if(FIX_BUGS)

Makefile

@@ -124,73 +124,73 @@ SOURCES = \
 	ValueView
 
 RESOURCES = \
-	BITMAP/CREDIT01.bmp \
-	BITMAP/CREDIT02.bmp \
-	BITMAP/CREDIT03.bmp \
-	BITMAP/CREDIT04.bmp \
-	BITMAP/CREDIT05.bmp \
-	BITMAP/CREDIT06.bmp \
-	BITMAP/CREDIT07.bmp \
-	BITMAP/CREDIT08.bmp \
-	BITMAP/CREDIT09.bmp \
-	BITMAP/CREDIT10.bmp \
-	BITMAP/CREDIT11.bmp \
-	BITMAP/CREDIT12.bmp \
-	BITMAP/CREDIT14.bmp \
-	BITMAP/CREDIT15.bmp \
-	BITMAP/CREDIT16.bmp \
-	BITMAP/CREDIT17.bmp \
-	BITMAP/CREDIT18.bmp \
+	BITMAP/Credit01.bmp \
+	BITMAP/Credit02.bmp \
+	BITMAP/Credit03.bmp \
+	BITMAP/Credit04.bmp \
+	BITMAP/Credit05.bmp \
+	BITMAP/Credit06.bmp \
+	BITMAP/Credit07.bmp \
+	BITMAP/Credit08.bmp \
+	BITMAP/Credit09.bmp \
+	BITMAP/Credit10.bmp \
+	BITMAP/Credit11.bmp \
+	BITMAP/Credit12.bmp \
+	BITMAP/Credit14.bmp \
+	BITMAP/Credit15.bmp \
+	BITMAP/Credit16.bmp \
+	BITMAP/Credit17.bmp \
+	BITMAP/Credit18.bmp \
 	CURSOR/CURSOR_IKA.bmp \
 	CURSOR/CURSOR_NORMAL.bmp \
-	ORG/ACCESS.org \
-	ORG/ANZEN.org \
-	ORG/BALCONY.org \
-	ORG/BALLOS.org \
-	ORG/BDOWN.org \
-	ORG/CEMETERY.org \
-	ORG/CURLY.org \
-	ORG/DR.org \
-	ORG/ENDING.org \
-	ORG/ESCAPE.org \
-	ORG/FANFALE1.org \
-	ORG/FANFALE2.org \
-	ORG/FANFALE3.org \
-	ORG/FIREEYE.org \
-	ORG/GAMEOVER.org \
-	ORG/GINSUKE.org \
-	ORG/GRAND.org \
-	ORG/GRAVITY.org \
-	ORG/HELL.org \
-	ORG/IRONH.org \
-	ORG/JENKA.org \
-	ORG/JENKA2.org \
-	ORG/KODOU.org \
-	ORG/LASTBT3.org \
-	ORG/LASTBTL.org \
-	ORG/LASTCAVE.org \
-	ORG/MARINE.org \
-	ORG/MAZE.org \
-	ORG/MDOWN2.org \
-	ORG/MURA.org \
-	ORG/OSIDE.org \
-	ORG/PLANT.org \
-	ORG/QUIET.org \
-	ORG/REQUIEM.org \
-	ORG/TOROKO.org \
-	ORG/VIVI.org \
-	ORG/WANPAK2.org \
-	ORG/WANPAKU.org \
-	ORG/WEED.org \
-	ORG/WHITE.org \
+	ORG/Access.org \
+	ORG/Anzen.org \
+	ORG/Balcony.org \
+	ORG/Ballos.org \
+	ORG/BreakDown.org \
+	ORG/Cemetery.org \
+	ORG/Curly.org \
+	ORG/Dr.org \
+	ORG/Ending.org \
+	ORG/Escape.org \
+	ORG/Fanfale1.org \
+	ORG/Fanfale2.org \
+	ORG/Fanfale3.org \
+	ORG/FireEye.org \
+	ORG/Gameover.org \
+	ORG/Ginsuke.org \
+	ORG/Grand.org \
+	ORG/Gravity.org \
+	ORG/Hell.org \
+	ORG/ironH.org \
+	ORG/Jenka.org \
+	ORG/Jenka2.org \
+	ORG/Kodou.org \
+	ORG/LastBtl3.org \
+	ORG/LastBtl.org \
+	ORG/LastCave.org \
+	ORG/Marine.org \
+	ORG/Maze.org \
+	ORG/MDown2.org \
+	ORG/Mura.org \
+	ORG/Oside.org \
+	ORG/Plant.org \
+	ORG/quiet.org \
+	ORG/Requiem.org \
+	ORG/Toroko.org \
+	ORG/Vivi.org \
+	ORG/Wanpak2.org \
+	ORG/Wanpaku.org \
+	ORG/Weed.org \
+	ORG/White.org \
 	ORG/XXXX.org \
-	ORG/ZONBIE.org \
-	WAVE/WAVE100
+	ORG/Zonbie.org \
+	WAVE/Wave.dat \
 
 ifeq ($(JAPANESE), 1)
-	RESOURCES += BITMAP/PIXEL_JP.bmp
+	RESOURCES += BITMAP/pixel_jp.bmp
 else
-	RESOURCES += BITMAP/PIXEL.bmp
+	RESOURCES += BITMAP/pixel.bmp
 endif
 
 ifneq ($(WINDOWS), 1)

src/Draw.cpp

@@ -354,10 +354,13 @@ static BOOL LoadBitmap_File(const char *name, Surface_Ids surf_no, bool create_s
 
 static BOOL LoadBitmap_Resource(const char *res, Surface_Ids surf_no, bool create_surface)
 {
-	SDL_RWops *fp = FindResource(res);
+	size_t size;
+	const unsigned char *data = FindResource(res, "BITMAP", &size);
 	
-	if (fp)
+	if (data)
 	{
+		SDL_RWops *fp = SDL_RWFromConstMem(data, size);
+
 		printf("Loading surface from resource %s for surface id %d\n", res, surf_no);
 		if (LoadBitmap(fp, surf_no, create_surface))
 			return TRUE;

src/Main.cpp

@@ -212,10 +212,13 @@ int main(int argc, char *argv[])
 		RECT unused_rect = {0, 0, 320, 240};
 
 		//Load cursor
-		SDL_RWops *fp = FindResource("CURSOR_NORMAL");
+		size_t size;
+		const unsigned char *data = FindResource("CURSOR_NORMAL", "CURSOR", &size);
 		
-		if (fp)
+		if (data)
 		{
+			SDL_RWops *fp = SDL_RWFromConstMem(data, size);
+
 			SDL_Surface *cursor_surface = SDL_LoadBMP_RW(fp, 1);
 			SDL_SetColorKey(cursor_surface, SDL_TRUE, SDL_MapRGB(cursor_surface->format, 0xFF, 0, 0xFF));	// Pink regions are transparent
 
@@ -314,10 +317,12 @@ int main(int argc, char *argv[])
 			
 #ifndef WINDOWS
 			//Load icon
-			SDL_RWops *fp = FindResource("ICON_MINI");
+			size_t size;
+			const unsigned char *data = FindResource("ICON_MINI", "ICON", &size);
 			
-			if (fp)
+			if (data)
 			{
+				SDL_RWops *fp = SDL_RWFromConstMem(data, size);
 				SDL_Surface *iconSurf = SDL_LoadBMP_RW(fp, 1);
 				SDL_Surface *iconConverted = SDL_ConvertSurfaceFormat(iconSurf, SDL_PIXELFORMAT_RGB888, 0);
 				SDL_FreeSurface(iconSurf);

src/Organya.cpp

@@ -261,19 +261,16 @@ void ReleaseOrganyaObject(int8_t track)
 //Handling WAVE100
 int8_t wave_data[100][0x100];
 
-bool InitWaveData100()
+BOOL InitWaveData100()
 {
-	SDL_RWops *fp = FindResource("WAVE100");
-	if (fp == NULL)
-	{
-		printf("Failed to open WAVE100\n");
-		return false;
-	}
+	const unsigned char *data = FindResource("WAVE100", "WAVE", NULL);
 
-	fp->read(fp, wave_data, 1, 100 * 0x100);
+	if (data == NULL)
+		return FALSE;
 
-	SDL_RWclose(fp);
-	return true;
+	memcpy(wave_data, data, 100 * 0x100);
+
+	return TRUE;
 }
 
 //Create org wave
@@ -409,6 +406,9 @@ void SetPlayPointer(int32_t x)
 	play_p = x;
 }
 
+#define READ_LE16(pointer) pointer[0] | (pointer[1] << 8); pointer += 2;
+#define READ_LE32(pointer) pointer[0] | (pointer[1] << 8) | (pointer[2] << 16) | (pointer[3] << 24); pointer += 4;
+
 //Load organya file
 void LoadOrganya(const char *name)
 {
@@ -426,19 +426,14 @@ void LoadOrganya(const char *name)
 
 	//Open file
 	printf("Loading org %s\n", name);
-	SDL_RWops *fp = FindResource(name);
-
-	if (!fp)
-	{
-		printf("Failed to open %s\n", name);
-		return;
-	}
+	const unsigned char *p = FindResource(name, "ORG", NULL);
 
 	//Version Check
 	uint8_t ver = 0;
 	char pass_check[6];
 
-	SDL_RWread(fp, &pass_check[0], sizeof(char), 6);
+	memcpy(pass_check, p, 6);
+	p += 6;
 
 	if (!memcmp(pass_check, "Org-01", 6))ver = 1;
 	if (!memcmp(pass_check, "Org-02", 6))ver = 2;
@@ -446,23 +441,23 @@ void LoadOrganya(const char *name)
 
 	if (!ver)
 	{
-		printf("Failed to open.org, invalid version %s", pass_check);
+		printf("Failed to open .org, invalid version %s", pass_check);
 		return;
 	}
 	
 	//Set song information
-	info.wait = SDL_ReadLE16(fp);
-	info.line = SDL_ReadU8(fp);
-	info.dot = SDL_ReadU8(fp);
-	info.repeat_x = SDL_ReadLE32(fp);
-	info.end_x = SDL_ReadLE32(fp);
+	info.wait = READ_LE16(p);
+	info.line = *p++;
+	info.dot = *p++;
+	info.repeat_x = READ_LE32(p);
+	info.end_x = READ_LE32(p);
 	
 	for (int i = 0; i < 16; i++) {
-		info.tdata[i].freq = SDL_ReadLE16(fp);
-		info.tdata[i].wave_no = SDL_ReadU8(fp);
-		const int8_t pipi = SDL_ReadU8(fp);
+		info.tdata[i].freq = READ_LE16(p);
+		info.tdata[i].wave_no = *p++;
+		const int8_t pipi = *p++;
 		info.tdata[i].pipi = ver == 1 ? 0 : pipi;
-		info.tdata[i].note_num = SDL_ReadLE16(fp);
+		info.tdata[i].note_num = READ_LE16(p);
 	}
 
 	//Load notes
@@ -495,37 +490,35 @@ void LoadOrganya(const char *name)
 		//Set note properties
 		np = info.tdata[j].note_p; //X position
 		for (int i = 0; i < info.tdata[j].note_num; i++) {
-			np->x = SDL_ReadLE32(fp);
+			np->x = READ_LE32(p);
 			np++;
 		}
 
 		np = info.tdata[j].note_p; //Y position
 		for (int i = 0; i < info.tdata[j].note_num; i++) {
-			np->y = SDL_ReadU8(fp);
+			np->y = *p++;
 			np++;
 		}
 
 		np = info.tdata[j].note_p; //Length
 		for (int i = 0; i < info.tdata[j].note_num; i++) {
-			np->length = SDL_ReadU8(fp);
+			np->length = *p++;
 			np++;
 		}
 
 		np = info.tdata[j].note_p; //Volume
 		for (int i = 0; i < info.tdata[j].note_num; i++) {
-			np->volume = SDL_ReadU8(fp);
+			np->volume = *p++;
 			np++;
 		}
 
 		np = info.tdata[j].note_p; //Pan
 		for (int i = 0; i < info.tdata[j].note_num; i++) {
-			np->pan = SDL_ReadU8(fp);
+			np->pan = *p++;
 			np++;
 		}
 	}
 
-	SDL_RWclose(fp);
-
 	//Create waves
 	for (int j = 0; j < 8; j++)
 		MakeOrganyaWave(j, info.tdata[j].wave_no, info.tdata[j].pipi);

src/Resource.cpp

@@ -1,77 +1,72 @@
 #include "Resource.h"
 
-#include <stdint.h>
-#include <stdio.h>
+#include <stddef.h>
 #include <string.h>
 
-#include <SDL_rwops.h>
-
-#include "WindowsWrapper.h"
-
-#include "Resource/ORG/ACCESS.org.h"
-#include "Resource/ORG/ANZEN.org.h"
-#include "Resource/ORG/BALCONY.org.h"
-#include "Resource/ORG/BALLOS.org.h"
-#include "Resource/ORG/BDOWN.org.h"
-#include "Resource/ORG/CEMETERY.org.h"
-#include "Resource/ORG/CURLY.org.h"
-#include "Resource/ORG/DR.org.h"
-#include "Resource/ORG/ENDING.org.h"
-#include "Resource/ORG/ESCAPE.org.h"
-#include "Resource/ORG/FANFALE1.org.h"
-#include "Resource/ORG/FANFALE2.org.h"
-#include "Resource/ORG/FANFALE3.org.h"
-#include "Resource/ORG/FIREEYE.org.h"
-#include "Resource/ORG/GAMEOVER.org.h"
-#include "Resource/ORG/GINSUKE.org.h"
-#include "Resource/ORG/GRAND.org.h"
-#include "Resource/ORG/GRAVITY.org.h"
-#include "Resource/ORG/HELL.org.h"
-#include "Resource/ORG/IRONH.org.h"
-#include "Resource/ORG/JENKA.org.h"
-#include "Resource/ORG/JENKA2.org.h"
-#include "Resource/ORG/KODOU.org.h"
-#include "Resource/ORG/LASTBT3.org.h"
-#include "Resource/ORG/LASTBTL.org.h"
-#include "Resource/ORG/LASTCAVE.org.h"
-#include "Resource/ORG/MARINE.org.h"
-#include "Resource/ORG/MAZE.org.h"
-#include "Resource/ORG/MDOWN2.org.h"
-#include "Resource/ORG/MURA.org.h"
-#include "Resource/ORG/OSIDE.org.h"
-#include "Resource/ORG/PLANT.org.h"
-#include "Resource/ORG/QUIET.org.h"
-#include "Resource/ORG/REQUIEM.org.h"
-#include "Resource/ORG/TOROKO.org.h"
-#include "Resource/ORG/VIVI.org.h"
-#include "Resource/ORG/WANPAK2.org.h"
-#include "Resource/ORG/WANPAKU.org.h"
-#include "Resource/ORG/WEED.org.h"
-#include "Resource/ORG/WHITE.org.h"
+#include "Resource/ORG/Access.org.h"
+#include "Resource/ORG/Anzen.org.h"
+#include "Resource/ORG/Balcony.org.h"
+#include "Resource/ORG/Ballos.org.h"
+#include "Resource/ORG/BreakDown.org.h"
+#include "Resource/ORG/Cemetery.org.h"
+#include "Resource/ORG/Curly.org.h"
+#include "Resource/ORG/Dr.org.h"
+#include "Resource/ORG/Ending.org.h"
+#include "Resource/ORG/Escape.org.h"
+#include "Resource/ORG/Fanfale1.org.h"
+#include "Resource/ORG/Fanfale2.org.h"
+#include "Resource/ORG/Fanfale3.org.h"
+#include "Resource/ORG/FireEye.org.h"
+#include "Resource/ORG/Gameover.org.h"
+#include "Resource/ORG/Ginsuke.org.h"
+#include "Resource/ORG/Grand.org.h"
+#include "Resource/ORG/Gravity.org.h"
+#include "Resource/ORG/Hell.org.h"
+#include "Resource/ORG/ironH.org.h"
+#include "Resource/ORG/Jenka.org.h"
+#include "Resource/ORG/Jenka2.org.h"
+#include "Resource/ORG/Kodou.org.h"
+#include "Resource/ORG/LastBtl3.org.h"
+#include "Resource/ORG/LastBtl.org.h"
+#include "Resource/ORG/LastCave.org.h"
+#include "Resource/ORG/Marine.org.h"
+#include "Resource/ORG/Maze.org.h"
+#include "Resource/ORG/MDown2.org.h"
+#include "Resource/ORG/Mura.org.h"
+#include "Resource/ORG/Oside.org.h"
+#include "Resource/ORG/Plant.org.h"
+#include "Resource/ORG/quiet.org.h"
+#include "Resource/ORG/Requiem.org.h"
+#include "Resource/ORG/Toroko.org.h"
+#include "Resource/ORG/Vivi.org.h"
+#include "Resource/ORG/Wanpak2.org.h"
+#include "Resource/ORG/Wanpaku.org.h"
+#include "Resource/ORG/Weed.org.h"
+#include "Resource/ORG/White.org.h"
 #include "Resource/ORG/XXXX.org.h"
-#include "Resource/ORG/ZONBIE.org.h"
-#include "Resource/WAVE/WAVE100.h"
-#include "Resource/BITMAP/CREDIT01.bmp.h"
-#include "Resource/BITMAP/CREDIT02.bmp.h"
-#include "Resource/BITMAP/CREDIT03.bmp.h"
-#include "Resource/BITMAP/CREDIT04.bmp.h"
-#include "Resource/BITMAP/CREDIT05.bmp.h"
-#include "Resource/BITMAP/CREDIT06.bmp.h"
-#include "Resource/BITMAP/CREDIT07.bmp.h"
-#include "Resource/BITMAP/CREDIT08.bmp.h"
-#include "Resource/BITMAP/CREDIT09.bmp.h"
-#include "Resource/BITMAP/CREDIT10.bmp.h"
-#include "Resource/BITMAP/CREDIT11.bmp.h"
-#include "Resource/BITMAP/CREDIT12.bmp.h"
-#include "Resource/BITMAP/CREDIT14.bmp.h"
-#include "Resource/BITMAP/CREDIT15.bmp.h"
-#include "Resource/BITMAP/CREDIT16.bmp.h"
-#include "Resource/BITMAP/CREDIT17.bmp.h"
-#include "Resource/BITMAP/CREDIT18.bmp.h"
+#include "Resource/ORG/Zonbie.org.h"
+#include "Resource/WAVE/Wave.dat.h"
+#include "Resource/BITMAP/Credit01.bmp.h"
+#include "Resource/BITMAP/Credit02.bmp.h"
+#include "Resource/BITMAP/Credit03.bmp.h"
+#include "Resource/BITMAP/Credit04.bmp.h"
+#include "Resource/BITMAP/Credit05.bmp.h"
+#include "Resource/BITMAP/Credit06.bmp.h"
+#include "Resource/BITMAP/Credit07.bmp.h"
+#include "Resource/BITMAP/Credit08.bmp.h"
+#include "Resource/BITMAP/Credit09.bmp.h"
+#include "Resource/BITMAP/Credit10.bmp.h"
+#include "Resource/BITMAP/Credit11.bmp.h"
+#include "Resource/BITMAP/Credit12.bmp.h"
+#include "Resource/BITMAP/Credit14.bmp.h"
+#include "Resource/BITMAP/Credit15.bmp.h"
+#include "Resource/BITMAP/Credit16.bmp.h"
+#include "Resource/BITMAP/Credit17.bmp.h"
+#include "Resource/BITMAP/Credit18.bmp.h"
 #ifdef JAPANESE
-#include "Resource/BITMAP/PIXEL_JP.bmp.h"
+#include "Resource/BITMAP/pixel_jp.bmp.h"
 #else
-#include "Resource/BITMAP/PIXEL.bmp.h"
+#include "Resource/BITMAP/pixel.bmp.h"
 #endif
 #ifndef WINDOWS
 #include "Resource/ICON/ICON_MINI.bmp.h"
@@ -79,362 +74,102 @@
 #include "Resource/CURSOR/CURSOR_IKA.bmp.h"
 #include "Resource/CURSOR/CURSOR_NORMAL.bmp.h"
 
-const unsigned char* GetResource(const char *name, size_t *size)
+static const struct
 {
-	//ORG
-	if (!strcmp(name, "ACCESS"))
-	{
-		*size = sizeof(rACCESS);
-		return rACCESS;
-	}
-	if (!strcmp(name, "ANZEN"))
-	{
-		*size = sizeof(rANZEN);
-		return rANZEN;
-	}
-	if (!strcmp(name, "BALCONY"))
-	{
-		*size = sizeof(rBALCONY);
-		return rBALCONY;
-	}
-	if (!strcmp(name, "BALLOS"))
-	{
-		*size = sizeof(rBALLOS);
-		return rBALLOS;
-	}
-	if (!strcmp(name, "BDOWN"))
-	{
-		*size = sizeof(rBDOWN);
-		return rBDOWN;
-	}
-	if (!strcmp(name, "CEMETERY"))
-	{
-		*size = sizeof(rCEMETERY);
-		return rCEMETERY;
-	}
-	if (!strcmp(name, "CURLY"))
-	{
-		*size = sizeof(rCURLY);
-		return rCURLY;
-	}
-	if (!strcmp(name, "DR"))
-	{
-		*size = sizeof(rDR);
-		return rDR;
-	}
-	if (!strcmp(name, "ENDING"))
-	{
-		*size = sizeof(rENDING);
-		return rENDING;
-	}
-	if (!strcmp(name, "ESCAPE"))
-	{
-		*size = sizeof(rESCAPE);
-		return rESCAPE;
-	}
-	if (!strcmp(name, "FANFALE1"))
-	{
-		*size = sizeof(rFANFALE1);
-		return rFANFALE1;
-	}
-	if (!strcmp(name, "FANFALE2"))
-	{
-		*size = sizeof(rFANFALE2);
-		return rFANFALE2;
-	}
-	if (!strcmp(name, "FANFALE3"))
-	{
-		*size = sizeof(rFANFALE3);
-		return rFANFALE3;
-	}
-	if (!strcmp(name, "FIREEYE"))
-	{
-		*size = sizeof(rFIREEYE);
-		return rFIREEYE;
-	}
-	if (!strcmp(name, "GAMEOVER"))
-	{
-		*size = sizeof(rGAMEOVER);
-		return rGAMEOVER;
-	}
-	if (!strcmp(name, "GINSUKE"))
-	{
-		*size = sizeof(rGINSUKE);
-		return rGINSUKE;
-	}
-	if (!strcmp(name, "GRAND"))
-	{
-		*size = sizeof(rGRAND);
-		return rGRAND;
-	}
-	if (!strcmp(name, "GRAVITY"))
-	{
-		*size = sizeof(rGRAVITY);
-		return rGRAVITY;
-	}
-	if (!strcmp(name, "HELL"))
-	{
-		*size = sizeof(rHELL);
-		return rHELL;
-	}
-	if (!strcmp(name, "IRONH"))
-	{
-		*size = sizeof(rIRONH);
-		return rIRONH;
-	}
-	if (!strcmp(name, "JENKA"))
-	{
-		*size = sizeof(rJENKA);
-		return rJENKA;
-	}
-	if (!strcmp(name, "JENKA2"))
-	{
-		*size = sizeof(rJENKA2);
-		return rJENKA2;
-	}
-	if (!strcmp(name, "KODOU"))
-	{
-		*size = sizeof(rKODOU);
-		return rKODOU;
-	}
-	if (!strcmp(name, "LASTBT3"))
-	{
-		*size = sizeof(rLASTBT3);
-		return rLASTBT3;
-	}
-	if (!strcmp(name, "LASTBTL"))
-	{
-		*size = sizeof(rLASTBTL);
-		return rLASTBTL;
-	}
-	if (!strcmp(name, "LASTCAVE"))
-	{
-		*size = sizeof(rLASTCAVE);
-		return rLASTCAVE;
-	}
-	if (!strcmp(name, "MARINE"))
-	{
-		*size = sizeof(rMARINE);
-		return rMARINE;
-	}
-	if (!strcmp(name, "MAZE"))
-	{
-		*size = sizeof(rMAZE);
-		return rMAZE;
-	}
-	if (!strcmp(name, "MDOWN2"))
-	{
-		*size = sizeof(rMDOWN2);
-		return rMDOWN2;
-	}
-	if (!strcmp(name, "MURA"))
-	{
-		*size = sizeof(rMURA);
-		return rMURA;
-	}
-	if (!strcmp(name, "OSIDE"))
-	{
-		*size = sizeof(rOSIDE);
-		return rOSIDE;
-	}
-	if (!strcmp(name, "PLANT"))
-	{
-		*size = sizeof(rPLANT);
-		return rPLANT;
-	}
-	if (!strcmp(name, "QUIET"))
-	{
-		*size = sizeof(rQUIET);
-		return rQUIET;
-	}
-	if (!strcmp(name, "REQUIEM"))
-	{
-		*size = sizeof(rREQUIEM);
-		return rREQUIEM;
-	}
-	if (!strcmp(name, "TOROKO"))
-	{
-		*size = sizeof(rTOROKO);
-		return rTOROKO;
-	}
-	if (!strcmp(name, "VIVI"))
-	{
-		*size = sizeof(rVIVI);
-		return rVIVI;
-	}
-	if (!strcmp(name, "WANPAK2"))
-	{
-		*size = sizeof(rWANPAK2);
-		return rWANPAK2;
-	}
-	if (!strcmp(name, "WANPAKU"))
-	{
-		*size = sizeof(rWANPAKU);
-		return rWANPAKU;
-	}
-	if (!strcmp(name, "WEED"))
-	{
-		*size = sizeof(rWEED);
-		return rWEED;
-	}
-	if (!strcmp(name, "WHITE"))
-	{
-		*size = sizeof(rWHITE);
-		return rWHITE;
-	}
-	if (!strcmp(name, "XXXX"))
-	{
-		*size = sizeof(rXXXX);
-		return rXXXX;
-	}
-	if (!strcmp(name, "ZONBIE"))
-	{
-		*size = sizeof(rZONBIE);
-		return rZONBIE;
-	}
+	const char *type;
+	const char *name;
+	const unsigned char *data;
+	size_t size;
+} resources[] = {
+	{"ORG", "ACCESS", rAccess, sizeof(rAccess)},
+	{"ORG", "ANZEN", rAnzen, sizeof(rAnzen)},
+	{"ORG", "BALCONY", rBalcony, sizeof(rBalcony)},
+	{"ORG", "BALLOS", rBallos, sizeof(rBallos)},
+	{"ORG", "BDOWN", rBreakDown, sizeof(rBreakDown)},
+	{"ORG", "CEMETERY", rCemetery, sizeof(rCemetery)},
+	{"ORG", "CURLY", rCurly, sizeof(rCurly)},
+	{"ORG", "DR", rDr, sizeof(rDr)},
+	{"ORG", "ENDING", rEnding, sizeof(rEnding)},
+	{"ORG", "ESCAPE", rEscape, sizeof(rEscape)},
+	{"ORG", "FANFALE1", rFanfale1, sizeof(rFanfale1)},
+	{"ORG", "FANFALE2", rFanfale2, sizeof(rFanfale2)},
+	{"ORG", "FANFALE3", rFanfale3, sizeof(rFanfale3)},
+	{"ORG", "FIREEYE", rFireEye, sizeof(rFireEye)},
+	{"ORG", "GAMEOVER", rGameover, sizeof(rGameover)},
+	{"ORG", "GINSUKE", rGinsuke, sizeof(rGinsuke)},
+	{"ORG", "GRAND", rGrand, sizeof(rGrand)},
+	{"ORG", "GRAVITY", rGravity, sizeof(rGravity)},
+	{"ORG", "HELL", rHell, sizeof(rHell)},
+	{"ORG", "IRONH", rironH, sizeof(rironH)},
+	{"ORG", "JENKA", rJenka, sizeof(rJenka)},
+	{"ORG", "JENKA2", rJenka2, sizeof(rJenka2)},
+	{"ORG", "KODOU", rKodou, sizeof(rKodou)},
+	{"ORG", "LASTBT3", rLastBtl3, sizeof(rLastBtl3)},
+	{"ORG", "LASTBTL", rLastBtl, sizeof(rLastBtl)},
+	{"ORG", "LASTCAVE", rLastCave, sizeof(rLastCave)},
+	{"ORG", "MARINE", rMarine, sizeof(rMarine)},
+	{"ORG", "MAZE", rMaze, sizeof(rMaze)},
+	{"ORG", "MDOWN2", rMDown2, sizeof(rMDown2)},
+	{"ORG", "MURA", rMura, sizeof(rMura)},
+	{"ORG", "OSIDE", rOside, sizeof(rOside)},
+	{"ORG", "PLANT", rPlant, sizeof(rPlant)},
+	{"ORG", "QUIET", rquiet, sizeof(rquiet)},
+	{"ORG", "REQUIEM", rRequiem, sizeof(rRequiem)},
+	{"ORG", "TOROKO", rToroko, sizeof(rToroko)},
+	{"ORG", "VIVI", rVivi, sizeof(rVivi)},
+	{"ORG", "WANPAK2", rWanpak2, sizeof(rWanpak2)},
+	{"ORG", "WANPAKU", rWanpaku, sizeof(rWanpaku)},
+	{"ORG", "WEED", rWeed, sizeof(rWeed)},
+	{"ORG", "WHITE", rWhite, sizeof(rWhite)},
+	{"ORG", "XXXX", rXXXX, sizeof(rXXXX)},
+	{"ORG", "ZONBIE", rZonbie, sizeof(rZonbie)},
 
-	//WAVE
-	if (!strcmp(name, "WAVE100"))
-	{
-		*size = sizeof(rWAVE100);
-		return rWAVE100;
-	}
+	{"WAVE", "WAVE100", rWave, sizeof(rWave)},
 
-	//Bitmap
-	if (!strcmp(name, "CREDIT01"))
-	{
-		*size = sizeof(rCREDIT01);
-		return rCREDIT01;
-	}
-	if (!strcmp(name, "CREDIT02"))
-	{
-		*size = sizeof(rCREDIT02);
-		return rCREDIT02;
-	}
-	if (!strcmp(name, "CREDIT03"))
-	{
-		*size = sizeof(rCREDIT03);
-		return rCREDIT03;
-	}
-	if (!strcmp(name, "CREDIT04"))
-	{
-		*size = sizeof(rCREDIT04);
-		return rCREDIT04;
-	}
-	if (!strcmp(name, "CREDIT05"))
-	{
-		*size = sizeof(rCREDIT05);
-		return rCREDIT05;
-	}
-	if (!strcmp(name, "CREDIT06"))
-	{
-		*size = sizeof(rCREDIT06);
-		return rCREDIT06;
-	}
-	if (!strcmp(name, "CREDIT07"))
-	{
-		*size = sizeof(rCREDIT07);
-		return rCREDIT07;
-	}
-	if (!strcmp(name, "CREDIT08"))
-	{
-		*size = sizeof(rCREDIT08);
-		return rCREDIT08;
-	}
-	if (!strcmp(name, "CREDIT09"))
-	{
-		*size = sizeof(rCREDIT09);
-		return rCREDIT09;
-	}
-	if (!strcmp(name, "CREDIT10"))
-	{
-		*size = sizeof(rCREDIT10);
-		return rCREDIT10;
-	}
-	if (!strcmp(name, "CREDIT11"))
-	{
-		*size = sizeof(rCREDIT11);
-		return rCREDIT11;
-	}
-	if (!strcmp(name, "CREDIT12"))
-	{
-		*size = sizeof(rCREDIT12);
-		return rCREDIT12;
-	}
-	if (!strcmp(name, "CREDIT14"))
-	{
-		*size = sizeof(rCREDIT14);
-		return rCREDIT14;
-	}
-	if (!strcmp(name, "CREDIT15"))
-	{
-		*size = sizeof(rCREDIT15);
-		return rCREDIT15;
-	}
-	if (!strcmp(name, "CREDIT16"))
-	{
-		*size = sizeof(rCREDIT16);
-		return rCREDIT16;
-	}
-	if (!strcmp(name, "CREDIT17"))
-	{
-		*size = sizeof(rCREDIT17);
-		return rCREDIT17;
-	}
-	if (!strcmp(name, "CREDIT18"))
-	{
-		*size = sizeof(rCREDIT18);
-		return rCREDIT18;
-	}
-	if (!strcmp(name, "PIXEL"))
-	{
+	{"BITMAP", "CREDIT01", rCredit01, sizeof(rCredit01)},
+	{"BITMAP", "CREDIT02", rCredit02, sizeof(rCredit02)},
+	{"BITMAP", "CREDIT03", rCredit03, sizeof(rCredit03)},
+	{"BITMAP", "CREDIT04", rCredit04, sizeof(rCredit04)},
+	{"BITMAP", "CREDIT05", rCredit05, sizeof(rCredit05)},
+	{"BITMAP", "CREDIT06", rCredit06, sizeof(rCredit06)},
+	{"BITMAP", "CREDIT07", rCredit07, sizeof(rCredit07)},
+	{"BITMAP", "CREDIT08", rCredit08, sizeof(rCredit08)},
+	{"BITMAP", "CREDIT09", rCredit09, sizeof(rCredit09)},
+	{"BITMAP", "CREDIT10", rCredit10, sizeof(rCredit10)},
+	{"BITMAP", "CREDIT11", rCredit11, sizeof(rCredit11)},
+	{"BITMAP", "CREDIT12", rCredit12, sizeof(rCredit12)},
+	{"BITMAP", "CREDIT14", rCredit14, sizeof(rCredit14)},
+	{"BITMAP", "CREDIT15", rCredit15, sizeof(rCredit15)},
+	{"BITMAP", "CREDIT16", rCredit16, sizeof(rCredit16)},
+	{"BITMAP", "CREDIT17", rCredit17, sizeof(rCredit17)},
+	{"BITMAP", "CREDIT18", rCredit18, sizeof(rCredit18)},
 #ifdef JAPANESE
-		*size = sizeof(rPIXEL_JP);
-		return rPIXEL_JP;
+	{"BITMAP", "PIXEL", rpixel_jp, sizeof(rpixel_jp)},
 #else
-		*size = sizeof(rPIXEL);
-		return rPIXEL;
+	{"BITMAP", "PIXEL", rpixel, sizeof(rpixel)},
 #endif
-	}
 
 #ifndef WINDOWS
-	//ICON
-	if (!strcmp(name, "ICON_MINI"))
-	{
-		*size = sizeof(rICON_MINI);
-		return rICON_MINI;
-	}
+	{"ICON", "ICON_MINI", rICON_MINI, sizeof(rICON_MINI)},
 #endif
 
-	//CURSOR
-	if (!strcmp(name, "CURSOR_NORMAL"))
-	{
-		*size = sizeof(rCURSOR_NORMAL);
-		return rCURSOR_NORMAL;
-	}
-	if (!strcmp(name, "CURSOR_IKA"))
-	{
-		*size = sizeof(rCURSOR_IKA);
-		return rCURSOR_IKA;
-	}
-	return NULL;
-}
+	{"CURSOR", "CURSOR_NORMAL", rCURSOR_NORMAL, sizeof(rCURSOR_NORMAL)},
+	{"CURSOR", "CURSOR_IKA", rCURSOR_IKA, sizeof(rCURSOR_IKA)},
 
-SDL_RWops* FindResource(const char *name)
+};
+
+const unsigned char* FindResource(const char *name, const char *type, size_t *size)
 {
-	size_t resSize;
-	const unsigned char* resource = GetResource(name, &resSize);
-	
-	if (!resource)
-		return NULL;
-	
-	SDL_RWops *fp = SDL_RWFromConstMem(resource, (int)resSize);
-	
-	if (!fp)
+	for (unsigned int i = 0; i < sizeof(resources) / sizeof(resources[0]); ++i)
 	{
-		printf("Couldn't open resource %s\nSDL Error: %s\n", name, SDL_GetError());
-		return NULL;
+		if (!strcmp(name, resources[i].name) && !strcmp(type, resources[i].type))
+		{
+			if (size)
+				*size = resources[i].size;
+
+			return resources[i].data;
+		}
 	}
 
-	return fp;
+	return NULL;
 }

src/Resource.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <SDL_rwops.h>
+#include <stddef.h>
 
-SDL_RWops* FindResource(const char *name);
+const unsigned char* FindResource(const char *name, const char *type, size_t *size);

src/Resource/BITMAP/Credit01.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT01[0x4B76] = {
+const unsigned char rCredit01[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit02.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT02[0x4B76] = {
+const unsigned char rCredit02[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit03.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT03[0x4B76] = {
+const unsigned char rCredit03[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit04.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT04[0x4B76] = {
+const unsigned char rCredit04[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit05.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT05[0x4B76] = {
+const unsigned char rCredit05[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit06.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT06[0x4B76] = {
+const unsigned char rCredit06[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit07.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT07[0x4B76] = {
+const unsigned char rCredit07[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit08.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT08[0x4B76] = {
+const unsigned char rCredit08[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit09.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT09[0x4B76] = {
+const unsigned char rCredit09[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit10.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT10[0x4B76] = {
+const unsigned char rCredit10[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit11.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT11[0x4B76] = {
+const unsigned char rCredit11[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit12.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT12[0x4B76] = {
+const unsigned char rCredit12[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit14.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT14[0x4B76] = {
+const unsigned char rCredit14[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit15.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT15[0x4B76] = {
+const unsigned char rCredit15[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit16.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT16[0x4B76] = {
+const unsigned char rCredit16[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit17.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT17[0x4B76] = {
+const unsigned char rCredit17[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/Credit18.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCREDIT18[0x4B76] = {
+const unsigned char rCredit18[0x4B76] = {
 	0x42, 0x4D, 0x76, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

src/Resource/BITMAP/PIXEL_JP.bmp.h

@@ -1,92 +0,0 @@
-#pragma once
-
-const unsigned char rPIXEL_JP[0x576] = {
-	0x42, 0x4D, 0x76, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
-	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xE2, 0xF3, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00,
-	0x10, 0x01, 0x10, 0x11, 0x00, 0x00, 0x11, 0x11, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x10, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x11, 0x11, 0x00, 0x11, 0x10, 0x00, 0x11, 0x10, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00,
-	0x01, 0x00, 0x01, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10,
-	0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-	0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x10, 0x01, 0x11, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x11,
-	0x11, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x01, 0x11, 0x11, 0x11, 0x11, 0x00, 0x01,
-	0x00, 0x00, 0x00, 0x10, 0x01, 0x01, 0x00, 0x10, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x10, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10,
-	0x10, 0x00, 0x10, 0x01, 0x11, 0x11, 0x11, 0x11, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x11,
-	0x11, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x01, 0x11, 0x11, 0x11, 0x01, 0x00, 0x01,
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x11, 0x11, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x10, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-	0x00, 0x00, 0x10, 0x10, 0x01, 0x00, 0x10, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x01,
-	0x11, 0x10, 0x00, 0x10, 0x01, 0x01, 0x00, 0x10, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x10,
-	0x11, 0x11, 0x10, 0x01, 0x11, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01,
-	0x00, 0x01, 0x00, 0x10, 0x10, 0x00, 0x10, 0x01, 0x11, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10,
-	0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x01, 0x10, 0x00, 0x01, 0x11, 0x11, 0x11, 0x11, 0x00, 0x01,
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00, 0x01,
-	0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x10,
-	0x11, 0x11, 0x10, 0x01, 0x01, 0x00, 0x10, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01,
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x11, 0x10, 0x00, 0x11, 0x10, 0x00, 0x11, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10,
-	0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x11, 0x00, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x10, 0x01,
-	0x11, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x10,
-	0x11, 0x11, 0x10, 0x01, 0x11, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};

src/Resource/BITMAP/pixel.bmp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rPIXEL[0x576] = {
+const unsigned char rpixel[0x576] = {
 	0x42, 0x4D, 0x76, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0xC2, 0x1E, 0x00, 0x00, 0xC2, 0x1E, 0x00, 0x00, 0x00, 0x00,

src/Resource/ICON/ICON_MINI.bmp.h

@@ -1,22 +0,0 @@
-#pragma once
-
-const unsigned char rICON_MINI[0x11A] = {
-	0x42, 0x4D, 0x1A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x6C, 0x00,
-	0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x08, 0x00,
-	0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x42, 0x47, 0x52, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xC0, 0xC0,
-	0xC0, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x33, 0x33, 0x33, 0x00, 0x00, 0x03,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x22, 0x23, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x32, 0x22, 0x33,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x77, 0x22, 0x73, 0x33, 0x33, 0x33, 0x33, 0x33, 0x70, 0x00, 0x33,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x70, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x37, 0x05, 0x33,
-	0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x50, 0x00, 0x33, 0x33, 0x33, 0x30, 0x77, 0x77, 0x77, 0x77,
-	0x03, 0x33, 0x33, 0x40, 0x71, 0x77, 0x77, 0x71, 0x74, 0x33, 0x33, 0x40, 0x71, 0x77, 0x77, 0x71,
-	0x54, 0x33, 0x34, 0x30, 0x51, 0x77, 0x77, 0x51, 0x53, 0x33, 0x36, 0x32, 0x00, 0x00, 0x55, 0x55,
-	0x23, 0x33, 0x33, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23, 0x33, 0x33, 0x27, 0x77, 0x77, 0x77,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33
-};

src/Resource/ORG/Access.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rACCESS[0x472] = {
+const unsigned char rAccess[0x472] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x64, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
 	0x00, 0x00, 0xE8, 0x03, 0x46, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x46, 0x00, 0x31, 0x00, 0xE8, 0x03,
 	0x20, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00,

src/Resource/ORG/Anzen.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rANZEN[0x23EA] = {
+const unsigned char rAnzen[0x23EA] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x6E, 0x00, 0x04, 0x03, 0x30, 0x00, 0x00, 0x00, 0xA0, 0x02,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x3C, 0x00, 0xC9, 0x00, 0xE8, 0x03,
 	0x5C, 0x00, 0x7D, 0x00, 0xE8, 0x03, 0x2E, 0x00, 0x7A, 0x00, 0xE8, 0x03, 0x0A, 0x00, 0xFB, 0x00,

src/Resource/ORG/Balcony.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rBALCONY[0xC0A] = {
+const unsigned char rBalcony[0xC0A] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0xA0, 0x00, 0x04, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x3C, 0x00, 0xE0, 0x00, 0xE8, 0x03,
 	0x2F, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x5C, 0x00, 0x20, 0x00, 0xE8, 0x03, 0x42, 0x00, 0x00, 0x00,

src/Resource/ORG/Ballos.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rBALLOS[0xDF2] = {
+const unsigned char rBallos[0xDF2] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x6E, 0x00, 0x04, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x21, 0x00, 0x00, 0x01, 0xE8, 0x03,
 	0x00, 0x00, 0x10, 0x00, 0xE8, 0x03, 0x5C, 0x00, 0x08, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00,

src/Resource/ORG/BreakDown.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rBDOWN[0xA0A] = {
+const unsigned char rBreakDown[0xA0A] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x6E, 0x00, 0x04, 0x04, 0xC0, 0x00, 0x00, 0x00, 0x40, 0x01,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x42, 0x00, 0xA0, 0x00, 0xE8, 0x03,
 	0x3F, 0x00, 0x2D, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x26, 0x00, 0xE8, 0x03, 0x5C, 0x00, 0x40, 0x00,

src/Resource/ORG/Cemetery.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCEMETERY[0x11E2] = {
+const unsigned char rCemetery[0x11E2] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0xB4, 0x00, 0x04, 0x03, 0x30, 0x00, 0x00, 0x00, 0xF0, 0x00,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x0A, 0x00, 0x76, 0x00, 0xE8, 0x03,
 	0x3C, 0x00, 0x30, 0x00, 0xE8, 0x03, 0x02, 0x00, 0x16, 0x00, 0x20, 0x03, 0x00, 0x00, 0x77, 0x00,

src/Resource/ORG/Curly.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rCURLY[0x648A] = {
+const unsigned char rCurly[0x648A] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x5C, 0x00, 0x04, 0x06, 0x60, 0x00, 0x00, 0x00, 0xB8, 0x05,
 	0x00, 0x00, 0xE8, 0x03, 0x01, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x42, 0x00, 0x51, 0x02, 0xE8, 0x03,
 	0x5C, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x3F, 0x00, 0x4A, 0x01, 0xE8, 0x03, 0x2F, 0x00, 0xD9, 0x01,

src/Resource/ORG/Dr.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rDR[0x872] = {
+const unsigned char rDr[0x872] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0xA0, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x5C, 0x00, 0x28, 0x00, 0x58, 0x02,
 	0x5C, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00,

src/Resource/ORG/Ending.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rENDING[0x45EA] = {
+const unsigned char rEnding[0x45EA] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x46, 0x00, 0x04, 0x06, 0x60, 0x00, 0x00, 0x00, 0xE0, 0x04,
 	0x00, 0x00, 0xE8, 0x03, 0x2F, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x2F, 0x00, 0x83, 0x01, 0xE8, 0x03,
 	0x07, 0x00, 0xA2, 0x01, 0xE8, 0x03, 0x32, 0x00, 0xF5, 0x00, 0xE8, 0x03, 0x2F, 0x00, 0x82, 0x01,

src/Resource/ORG/Escape.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rESCAPE[0x1DC2] = {
+const unsigned char rEscape[0x1DC2] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x5A, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
 	0x00, 0x00, 0xE8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x42, 0x00, 0x39, 0x00, 0xE8, 0x03,
 	0x42, 0x00, 0x65, 0x00, 0xE8, 0x03, 0x5C, 0x00, 0x00, 0x01, 0xE8, 0x03, 0x2F, 0x00, 0x40, 0x00,

src/Resource/ORG/Fanfale1.org.h

@@ -1,6 +1,6 @@
 #pragma once
 
-const unsigned char rFANFALE1[0x392] = {
+const unsigned char rFanfale1[0x392] = {
 	0x4F, 0x72, 0x67, 0x2D, 0x30, 0x32, 0x64, 0x00, 0x04, 0x04, 0x30, 0x00, 0x00, 0x00, 0x40, 0x00,
 	0x00, 0x00, 0xE8, 0x03, 0x2F, 0x00, 0x00, 0x00, 0xE8, 0x03, 0x2F, 0x00, 0x0E, 0x00, 0xE8, 0x03,
 	0x5C, 0x00, 0x0A, 0x00, 0xE8, 0x03, 0x3C, 0x00, 0x1B, 0x00, 0xE8, 0x03, 0x2F, 0x00, 0x00, 0x00,