mirror of
https://github.com/ApacheThunder/GBA-Exploader.git
synced 2025-06-18 19:45:39 -04:00
Fixed GBA mode switch.
* libnds's swiSwitchToGBAMode ASM function was broken. They used r0 instead of r2 so it didn't work. It must have been correct when GBA Exploader was last compiled more then a decade ago, but now it's broken so this ASM function had to be reimplemented. GBA Mode switch now appears to function as intended. * As I currently lack a compatible slot-2 flashcart (SuperCard Lite doesn't work even after trying a few hardcoded card types in main.c) further testing can't be done on the rest of the code. It appears to work but I won't know for sure until someone with compatible hardware tests it.
This commit is contained in:
ApacheThunder
parent
11ea610150
commit
6c10c47a61
2
Makefile
2
Makefile
@ -46,7 +46,7 @@ checkarm9:
|
||||
$(TARGET).nds : arm7/$(TARGET).elf arm9/$(TARGET).elf
|
||||
@ndstool -c $@ -7 arm7/$(TARGET).elf -9 arm9/$(TARGET).elf \
|
||||
-b $(CURDIR)/logo32.bmp "GBA ExpLoader;Version $(VERSTRING);By Rudolph;" \
|
||||
-g GBEX 01 "GBAEXPLOADER" -z 80040000 -u 00030004 -a 00000138 -p 0001 \
|
||||
-g #### 01 "GBAEXPLOADER" -z 80040000 -u 00030004 -a 00000138 -p 0001 \
|
||||
|
||||
data:
|
||||
@mkdir -p data
|
||||
|
||||
@ -35,8 +35,6 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
|
||||
|
||||
ASFLAGS := -g $(ARCH)
|
||||
LDFLAGS = -specs=ds_arm7.specs -g $(ARCH) -Wl,-Map,$(notdir $*).map
|
||||
# LDFLAGS = -specs=ds_arm7_iwram.specs -g $(ARCH) -Wl,-Map,$(notdir $*).map
|
||||
|
||||
|
||||
LIBS := -lnds7
|
||||
|
||||
|
||||
15
arm7/source/biosCalls.s
Normal file
15
arm7/source/biosCalls.s
Normal file
@ -0,0 +1,15 @@
|
||||
.TEXT
|
||||
.ARM
|
||||
|
||||
@---------------------------------------------------------------------------------------
|
||||
.GLOBAL swiSwitchToGBAModeFixed
|
||||
.func swiSwitchToGBAModeFixed
|
||||
@---------------------------------------------------------------------------------------
|
||||
swiSwitchToGBAModeFixed:
|
||||
mov r2,#0x40
|
||||
swi 0x1f0000
|
||||
|
||||
.endfunc
|
||||
|
||||
.end
|
||||
|
||||
@ -39,22 +39,22 @@ extern void ret_menu7_R4(void);
|
||||
extern void ret_menu7_Gen(void);
|
||||
extern void ret_menu7_mse(void);
|
||||
|
||||
// libnds messed up the original SWI bios call ASM.
|
||||
// They used r0 instead of r2. This reimplementation fixes that issue for now.
|
||||
extern void swiSwitchToGBAModeFixed();
|
||||
|
||||
void gbaMode() {
|
||||
vu32 vr;
|
||||
|
||||
REG_IME = IME_DISABLE;
|
||||
for(vr = 0; vr < 0x1000; vr++); // Wait ARM9
|
||||
|
||||
if (((*(vu32*)0x027FFCE4 >> 3) & 0x01) == 0x01) {
|
||||
writePowerManagement(0, PM_BACKLIGHT_BOTTOM | PM_SOUND_AMP);
|
||||
if (PersonalData->gbaScreen) {
|
||||
writePowerManagement(PM_CONTROL_REG, PM_BACKLIGHT_BOTTOM | PM_SOUND_AMP);
|
||||
} else {
|
||||
writePowerManagement(0, PM_BACKLIGHT_TOP | PM_SOUND_AMP);
|
||||
writePowerManagement(PM_CONTROL_REG, PM_BACKLIGHT_TOP | PM_SOUND_AMP);
|
||||
}
|
||||
|
||||
swiSwitchToGBAMode();
|
||||
// asm("mov r2, #0x40");
|
||||
// asm("swi 0x1F0000");
|
||||
|
||||
swiSwitchToGBAModeFixed();
|
||||
while(1);
|
||||
}
|
||||
|
||||
|
||||
@ -197,32 +197,28 @@ static void resetToSlot2() {
|
||||
swiSoftReset();
|
||||
}
|
||||
|
||||
void gbaMode() {
|
||||
ITCM_CODE void gbaMode() {
|
||||
|
||||
/*if(strncmp(GBA_HEADER.gamecode, "PASS", 4) == 0) {
|
||||
if(strncmp(GBA_HEADER.gamecode, "PASS", 4) == 0) {
|
||||
resetARM9Memory();
|
||||
resetToSlot2();
|
||||
}*/
|
||||
}
|
||||
|
||||
videoSetMode(0);
|
||||
videoSetModeSub(0);
|
||||
|
||||
// vramSetMainBanks(VRAM_A_MAIN_BG, VRAM_B_MAIN_BG, VRAM_C_MAIN_BG, VRAM_D_MAIN_BG);
|
||||
vramSetPrimaryBanks(VRAM_A_MAIN_BG, VRAM_B_MAIN_BG, VRAM_C_MAIN_BG, VRAM_D_MAIN_BG);
|
||||
// vramSetMainBanks(VRAM_A_MAIN_BG, VRAM_B_MAIN_BG, VRAM_C_ARM7, VRAM_D_ARM7);
|
||||
|
||||
if(PersonalData->gbaScreen) { lcdMainOnBottom(); } else { lcdMainOnTop(); }
|
||||
|
||||
// FIFOSend(IPC_CMD_GBAMODE);
|
||||
fifoSendValue32(FIFO_USER_01, 1);
|
||||
|
||||
gba_frame();
|
||||
|
||||
// FIFOSend(IPC_CMD_GBAMODE);
|
||||
fifoSendValue32(FIFO_USER_01, 1);
|
||||
sysSetBusOwners(ARM7_OWNS_CARD, ARM7_OWNS_ROM);
|
||||
fifoSendValue32(FIFO_USER_01, 1);
|
||||
REG_IME = 0;
|
||||
while(1)swiWaitForVBlank();
|
||||
while(1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -7,9 +7,6 @@
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
||||
//#include "disc_io.h"
|
||||
//#include "gba_nds_fat.h"
|
||||
|
||||
#include "skin.h"
|
||||
|
||||
|
||||
@ -41,8 +38,7 @@ typedef struct {
|
||||
} TBMPHeader;
|
||||
|
||||
|
||||
static u16 GetVariable16bit(void *pb)
|
||||
{
|
||||
static u16 GetVariable16bit(void *pb) {
|
||||
u16 res;
|
||||
u8 *pb8=(u8*)pb;
|
||||
|
||||
@ -52,8 +48,7 @@ static u16 GetVariable16bit(void *pb)
|
||||
return(res);
|
||||
}
|
||||
|
||||
static u32 GetVariable32bit(void *pb)
|
||||
{
|
||||
static u32 GetVariable32bit(void *pb) {
|
||||
u32 res;
|
||||
u8 *pb8=(u8*)pb;
|
||||
|
||||
@ -66,8 +61,7 @@ static u32 GetVariable32bit(void *pb)
|
||||
}
|
||||
|
||||
|
||||
static bool GetBMPHeader(u8 *pb,TBMPHeader *pBMPHeader)
|
||||
{
|
||||
static bool GetBMPHeader(u8 *pb,TBMPHeader *pBMPHeader) {
|
||||
if(pb==NULL){
|
||||
// BMP_LoadErrorStr="SourceData Null.";
|
||||
return(false);
|
||||
@ -153,8 +147,7 @@ static bool GetBMPHeader(u8 *pb,TBMPHeader *pBMPHeader)
|
||||
}
|
||||
|
||||
|
||||
static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh)
|
||||
{
|
||||
static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh) {
|
||||
FILE *fh;
|
||||
|
||||
|
||||
@ -187,13 +180,13 @@ static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh)
|
||||
|
||||
if(bmdata==NULL){
|
||||
return(false);
|
||||
}else{
|
||||
// _consolePrintf("loadskin /shell/%s\n",bmpfn);
|
||||
}
|
||||
}/* else {
|
||||
_consolePrintf("loadskin /shell/%s\n",bmpfn);
|
||||
}*/
|
||||
|
||||
TBMPHeader BMPHeader;
|
||||
|
||||
if(GetBMPHeader(bmdata,&BMPHeader)==false){
|
||||
if(!GetBMPHeader(bmdata,&BMPHeader)) {
|
||||
// snprintf(bmerrstr1,256,"Request /shell/%s WindowsBitmapFormat",bmpfn);
|
||||
// snprintf(bmerrstr2,256,"%s",BMP_LoadErrorStr);
|
||||
// _consolePrintf("%s\n",bmerrstr1);
|
||||
@ -203,14 +196,16 @@ static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh)
|
||||
}
|
||||
|
||||
if((BMPHeader.biWidth==1)&&(BMPHeader.biHeight==1)) {
|
||||
free(bmdata); bmdata=NULL;
|
||||
return(false);
|
||||
free(bmdata);
|
||||
bmdata=NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
if(BMPHeader.biBitCount==32) {
|
||||
// _consolePrintf("Error. not support 32bit color.");
|
||||
free(bmdata); bmdata=NULL;
|
||||
return(false);
|
||||
free(bmdata);
|
||||
bmdata=NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
if((BMPHeader.biWidth<bmw)||(BMPHeader.biHeight<bmh)) {
|
||||
@ -218,8 +213,9 @@ static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh)
|
||||
// snprintf(bmerrstr2,256,"%d x %dpixel 8 or 24bitcolor NoCompression.",bmw,bmh);
|
||||
// _consolePrintf("%s\n",bmerrstr1);
|
||||
// _consolePrintf("%s\n",bmerrstr2);
|
||||
free(bmdata); bmdata=NULL;
|
||||
return(false);
|
||||
free(bmdata);
|
||||
bmdata=NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
u32 gr=0,gg=0,gb=0;
|
||||
@ -234,7 +230,6 @@ static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh)
|
||||
for(u32 y=0;y<bmh;y++) {
|
||||
u8 *pSrcBM=&BMPHeader.pBitmap[(BMPHeader.biHeight-1-y)*BMPHeader.DataWidth];
|
||||
u16 *pDstBM=&pbm[y*bmw];
|
||||
|
||||
switch(BMPHeader.biBitCount) {
|
||||
case 8: {
|
||||
u8 *PaletteTable=BMPHeader.pPalette;
|
||||
@ -275,56 +270,50 @@ static bool intLoadBM(const char *bmpfn,u16 *pbm,const u32 bmw,const u32 bmh)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#undef Gravity
|
||||
|
||||
free(bmdata); bmdata=NULL;
|
||||
free(bmdata);
|
||||
bmdata=NULL;
|
||||
|
||||
return(true);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
DTCM_DATA ALIGN(4) static u16 *pBuf;
|
||||
|
||||
ITCM_CODE bool LoadSkin(int mod, char *Name) {
|
||||
|
||||
bool LoadSkin(int mod, char *Name)
|
||||
{
|
||||
u16 *pBuf;
|
||||
u16 *pDstBuf1;
|
||||
u16 *pDstBuf2;
|
||||
|
||||
pBuf = (u16*)malloc(256*192*2);
|
||||
if(intLoadBM(Name, pBuf, 256, 192) == false) {
|
||||
free(pBuf);
|
||||
return(false);
|
||||
}
|
||||
if(!intLoadBM(Name, pBuf, 256, 192)) { free(pBuf); return false; }
|
||||
|
||||
if(mod == 0) {
|
||||
pDstBuf1 = (u16*)0x06020000;
|
||||
}
|
||||
if(mod == 1) {
|
||||
pDstBuf1 = (u16*)0x06220000;
|
||||
}
|
||||
if(mod == 2) {
|
||||
switch (mod) {
|
||||
case 0: pDstBuf1 = (u16*)0x06020000; break;
|
||||
case 1: pDstBuf1 = (u16*)0x06220000; break;
|
||||
case 2:
|
||||
pDstBuf1 = (u16*)0x06000000;
|
||||
pDstBuf2 = (u16*)0x06020000;
|
||||
// pDstBuf1 = (u16*)0x06800000;
|
||||
// pDstBuf2 = (u16*)0x06820000;
|
||||
break;
|
||||
default: pDstBuf1 = (u16*)0x06020000; break;
|
||||
}
|
||||
|
||||
for(s32 y=0;y<192;y++) {
|
||||
for(s32 x=0;x<256;x++) {
|
||||
pDstBuf1[x]=pBuf[x];
|
||||
if(mod == 2)
|
||||
pDstBuf2[x]=pBuf[x];
|
||||
if(mod == 2)pDstBuf2[x]=pBuf[x];
|
||||
}
|
||||
pDstBuf1+=256;
|
||||
if(mod == 2)
|
||||
pDstBuf2+=256;
|
||||
if(mod == 2)pDstBuf2+=256;
|
||||
pBuf+=256;
|
||||
}
|
||||
|
||||
|
||||
free(pBuf);
|
||||
return(true);
|
||||
// free(pBuf);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user