Update to K:1.06,FW:7

Sterophonick · Apr 17, 2019 · 3d52aab · 3d52aab
1 parent 091f216
commit 3d52aab
Show file tree

Hide file tree

Showing 70 changed files with 7,775 additions and 14,786 deletions.
diff --git a/Makefile b/Makefile
@@ -18,17 +18,17 @@ include $(DEVKITARM)/gba_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	omega-kernel
 BUILD		:=	build
-SOURCES		:=	source source/ff13b
+SOURCES		:=	source source/ff13c
 DATA		:=
 GRAPHICS	:=	gfx	
-INCLUDES	:=  $(INCLUDES) include source/ff13b
+INCLUDES	:=  $(INCLUDES) include source/ff13c
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-mthumb -mthumb-interwork
 
-CFLAGS	:=	-g -Wall -Os\
+CFLAGS	:= -g -Wall -Os \
 		-mcpu=arm7tdmi -mtune=arm7tdmi\
  		-fomit-frame-pointer\
 		-ffast-math \

diff --git a/SYSTEM/PLUG/ap.mb b/SYSTEM/PLUG/ap.mb
diff --git a/SYSTEM/PLUG/arc.mb b/SYSTEM/PLUG/arc.mb
diff --git a/SYSTEM/PLUG/bgf.mb b/SYSTEM/PLUG/bgf.mb
diff --git a/SYSTEM/PLUG/bmp.mb b/SYSTEM/PLUG/bmp.mb
diff --git a/SYSTEM/PLUG/c8.mb b/SYSTEM/PLUG/c8.mb
diff --git a/SYSTEM/PLUG/col.gba b/SYSTEM/PLUG/col.gba
diff --git a/SYSTEM/PLUG/gg.mb b/SYSTEM/PLUG/gg.mb
diff --git a/SYSTEM/PLUG/gsm.bin b/SYSTEM/PLUG/gsm.bin
diff --git a/SYSTEM/PLUG/jpeg.mb b/SYSTEM/PLUG/jpeg.mb
diff --git a/SYSTEM/PLUG/jpg.mb b/SYSTEM/PLUG/jpg.mb
diff --git a/SYSTEM/PLUG/k3m.bin b/SYSTEM/PLUG/k3m.bin
diff --git a/SYSTEM/PLUG/lz.mb b/SYSTEM/PLUG/lz.mb
diff --git a/SYSTEM/PLUG/mid.bin b/SYSTEM/PLUG/mid.bin
diff --git a/SYSTEM/PLUG/mod.bin b/SYSTEM/PLUG/mod.bin
diff --git a/SYSTEM/PLUG/ngc.mb b/SYSTEM/PLUG/ngc.mb
diff --git a/SYSTEM/PLUG/ngp.mb b/SYSTEM/PLUG/ngp.mb
diff --git a/SYSTEM/PLUG/ngpc.mb b/SYSTEM/PLUG/ngpc.mb
diff --git a/SYSTEM/PLUG/nsf.mbz b/SYSTEM/PLUG/nsf.mbz
diff --git a/SYSTEM/PLUG/pce.mb b/SYSTEM/PLUG/pce.mb
diff --git a/SYSTEM/PLUG/pcx.mb b/SYSTEM/PLUG/pcx.mb
diff --git a/SYSTEM/PLUG/raw.mb b/SYSTEM/PLUG/raw.mb
diff --git a/SYSTEM/PLUG/rom.gba b/SYSTEM/PLUG/rom.gba
diff --git a/SYSTEM/PLUG/sb.mb b/SYSTEM/PLUG/sb.mb
diff --git a/SYSTEM/PLUG/sg.mb b/SYSTEM/PLUG/sg.mb
diff --git a/SYSTEM/PLUG/sms.mb b/SYSTEM/PLUG/sms.mb
diff --git a/SYSTEM/PLUG/ssd.mb b/SYSTEM/PLUG/ssd.mb
diff --git a/SYSTEM/PLUG/sv.mb b/SYSTEM/PLUG/sv.mb
diff --git a/SYSTEM/PLUG/txt.bin b/SYSTEM/PLUG/txt.bin
diff --git a/SYSTEM/PLUG/wav.bin b/SYSTEM/PLUG/wav.bin
diff --git a/SYSTEM/PLUG/ws.mb b/SYSTEM/PLUG/ws.mb
diff --git a/SYSTEM/PLUG/wsc.mb b/SYSTEM/PLUG/wsc.mb
diff --git a/SYSTEM/PLUG/z80.gba b/SYSTEM/PLUG/z80.gba
diff --git a/SYSTEM/PLUG/zcode.bin b/SYSTEM/PLUG/zcode.bin
diff --git a/SYSTEM/RECENT.TXT b/SYSTEM/RECENT.TXT
diff --git a/manual/index.html b/manual/index.html
@@ -866,21 +866,39 @@ <h2 id="toc_37">Pogoshell</h2>
 
 <h4 id="toc_38">Packaged File Types</h4>
 
-<p><code>.bmp</code>: Windows Bitmap IMAGE</p>
-<p><code>.gg</code>: Sega Game Gear ROM File</p>
-<p><code>.jpg/.jpeg</code>: JPEG Image</p>
-<p><code>.mod</code>: ProTracker Module</p>
-<p><code>.ngc/.ngp/.ngpc</code>: Neo Geo Pocket ROM File</p>
-<p><code>.pce</code>: NEC PC-Engine/TurboGrafx-16 ROM File</p>
-<p><code>.rom</code>: MSX ROM File (Not a .DSK)</p>
-<p><code>.sg</code>: Sega SG-1000 ROM File</p>
+<p><code>.gba / .bin / .agb / .mb</code>: Game Boy Advance ROM File</p>
+<p><code>.col</code>: ColecoVision ROM File</p>
+<p><code>.gb / .gbc</code>: Game Boy / Color ROM File</p>
+<p><code>.gg</code>: Game Gear ROM File</p>
+<p><code>.rom</code>: MSX Cartridge ROM (not a .DSK)</p>
+<p><code>.ngp / .ngpc / .ngc</code>: Neo Geo Pocket / Color ROM File</p>
+<p><code>.nes</code>: NES ROM File</p>
+<p><code>.pce</code>: PC-Engine / TurboGrafx-16 ROM File</p>
 <p><code>.sms</code>: Sega Master System ROM File</p>
-<p><code>.sv</code>: Watara Supervision ROM File</p>
-<p><code>.ws/.wsc</code>: WonderSwan ROM File</p>
-<p><code>.z80</code>: ZX-Spectrum Z80 Snapshot</p>
+<p><code>.sg</code>: Sega SG-1000 ROM File</p>
+<p><code>.sv</code>: Watara SuperVision ROM File</p>
+<p><code>.ws / .wsc</code>: WonderSwan / Color ROM File</p>
+<p><code>.z80</code>: 48k ZX-Spectrum Z80 State FIle</p>
+<p><code>.arc</code>: Emerson Arcadia 2001 ROM File</p>
+<p><code>.c8</code>: Chip-8 ROM File</p>
+<p><code>.jpg / .jpeg</code>: JPEG Image</p>
+<p><code>.mod</code>: ProTracker Module File</p>
+<p><code>.pcx</code>: ZSoft Paintbrush PCX Image</p>
+<p><code>.mid</code>: MIDI Sequence</p>
+<p><code>.nsf</code>: NES Music File (Nintendo Sound File)</p>
+<p><code>.vgm</code>: SMS/GG Music File (NOT WORKING)</p>
+<p><code>.txt</code>: Text Document</p>
+<p><code>.gsm</code>: GSM Format Audio (NOT WORKING)</p>
+<p><code>.wav</code>: Wave Sound</p>
+<p><code>.k3m</code>: Krawall Advance Sound File</p>
+<p><code>.sb</code>: MaxMod Soundbank </p>
+<p><code>.lz</code>: LZ77 Compressed Mode 3 Bitmap</p>
+<p><code>.raw</code>: Uncompressed Mode 3 Bitmap</p>
+<p><code>.ap</code>: aPlib compressed Mode 3 Bitmap</p>
+<p><code>.bgf</code>: BoyScout Module File</p>
 
 <h4 id="toc_39">Plugins</h4>
-<p>Every single extension listed above is controlled by a file known as a Pogoshell plugin.</p>
+<p>Most extensions listed above is controlled by a file known as a Pogoshell plugin.</p>
 
 
 <h4 id="toc_40">Playing ColecoVision ROMs</h4>

diff --git a/source/Ezcard_OP.c b/source/Ezcard_OP.c
@@ -457,7 +457,9 @@ void IWRAM_CODE Check_FW_update(u16 Current_FW_ver,u16 Built_in_ver)
     //DEBUG_printf("get_crc32 %x ",get_crc32);
     //if(	get_crc32 != 0x22475DDC) //fw3
     //if(	get_crc32 != 0xEE2DACE7) //fw4
-    if(	get_crc32 != 0x7E6212AB) { //fw6
+	//if(	get_crc32 != 0x7E6212AB) //fw6
+	if( get_crc32 != 0xEFD03788) //fw7
+	{
         sprintf(msg,"CRC32 checksum failure!");
         DrawHZText12(msg,0,2,offset_Y+0*line_x, RGB(31,00,00),1);
         sprintf(msg,"Press (B) to return.");

diff --git a/source/Fire_Emblem_iQue_patch.s b/source/Fire_Emblem_iQue_patch.s
@@ -0,0 +1,88 @@
+@;--------------------------------------------------------------------
+	.section   	.text,"ax",%progbits
+
+	.global  Fire_Emblem_iQue_patch_start
+	.global  Fire_Emblem_iQue_patch_end
+
+
+@;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;	
+	.thumb
+Fire_Emblem_iQue_patch_start:
+	PUSH  {R0-R4}
+	BL		Set_save
+	POP   {R0-R4}
+	POP   {R4,R5}
+	POP 	{R0}
+	BX 		R0
+@;----------------------------------
+	PUSH 	{R0-R4}
+	BL		Set_save
+	POP  	{R0-R4}
+	MOV   R9, R4
+	POP  	{R4-R6}
+	POP   {R0}
+	BX    R0
+@;----------------------------------
+	PUSH	{R0-R4}
+	BL		Set_save
+	POP 	{R0-R4}
+	POP 	{R4-R7}
+	POP  	{R0}
+	BX    R0	
+@;----------------------------------
+	PUSH	{R0-R4}
+	BL		Set_save
+	POP 	{R0-R4}
+	MOV  	R8, R3
+	POP 	{R4-R7}
+	POP  	{R0}
+	BX    R0
+@;----------------------------------
+	MOV		R9, R4
+	POP		{R4-R7}
+	POP 	{R0}
+	PUSH  {R0}
+	PUSH  {R1-R5}
+	LDR  	R1, =0x80987AF
+	CMP 	R0, R1
+	BNE   exit
+	BL		Set_save
+exit:
+	POP   {R1-R5}
+	POP  	{R0}
+	BX    R0
+@;----------------------------------
+@;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;	
+Set_save:
+	PUSH	{R1-R7,LR}
+	MOV		R0,#0x02
+	BL		Set_AUTO_save
+	MOV		R0,#0x00
+	BL		Set_AUTO_save
+	POP		{R1-R7}	
+	POP		{R0}
+	BX		R0
+@;----------------------------------
+Set_AUTO_save:
+	LDR     R2, =0xFFFFD200
+	LDR     R3, =0x9FE0000
+	MOVS    R1, #0x80
+	STRH    R2, [R3]
+	MOVS    R3, #0xA8
+	LSL     R1, R1, #0x14
+	LSL     R3, R3, #5
+	STRH    R3, [R1]
+	LDR     R1, =0x8020000
+	STRH    R2, [R1]
+	LDR     R2, =0x8040000
+	STRH    R3, [R2]
+	LDR     R2, =0x96C0000
+	STRH    R0, [R2]
+	LDR     R2, =0x9FC0000
+	STRH    R3, [R2]
+	BX      LR
+
+	.ltorg	
+	.align	
+Fire_Emblem_iQue_patch_end:
+   .end
diff --git a/source/GBApatch.c b/source/GBApatch.c
@@ -1351,6 +1351,25 @@ void Check_Fire_Emblem(void)
 		  modify_val = 0x80B670F;
 		  have = 1;
 		}break;
+		case 0x43454641://Fire_Emblem_(Prototype,_iQue)
+		{
+			address1[0]=0x84FF0;
+			address1[1]=0x85048;
+			address1[2]=0x850F8;
+			address1[3]=0x85194;
+			address1[4]=0x858B0;
+			patchaddress=0xFFCC00;
+			code2[0]=Baseaddress+patchaddress+0x1;
+			code2[1]=Baseaddress+patchaddress+0xF;
+			code2[2]=Baseaddress+patchaddress+0x1F;
+			code2[3]=Baseaddress+patchaddress+0x2D;
+			code2[4]=Baseaddress+patchaddress+0x3D;
+		  p_patch_start = (u8*)Fire_Emblem_iQue_patch_start;
+		  p_patch_end  	= (u8*)Fire_Emblem_iQue_patch_end;
+		  //p_modify_address = (u8*)Modify_address_B;
+		  //modify_val = 0x80B670F;
+		  have = 1;
+		}break;
 	}
 
 	if(have){

diff --git a/source/GBApatch.h b/source/GBApatch.h
@@ -47,7 +47,8 @@ extern void Modify_address_A(void);
 extern void Fire_Emblem_B_patch_start(void);
 extern void Fire_Emblem_B_patch_end(void);
 extern void Modify_address_B(void);
-
+extern void Fire_Emblem_iQue_patch_start(void);
+extern void Fire_Emblem_iQue_patch_end(void);
 
 extern u32 gl_cheat_count;