falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

port: fix firing range 

props to Ryan again
This commit is contained in:
fgsfds 2023-08-14 17:53:08 +02:00
parent 4d52a8e476
commit a31e2209c5
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
port/src/preprocess.c
View File

@ -997,16 +997,6 @@ void preprocessSequences(u8 *data, u32 size)
}
}
void preprocessFiringRange(u8 *data, u32 size)
{
// u16 texts[9] is the first and only thing we care about here
// probably no sense supporting custom sizes either
u16 *texts = (u16 *)data;
for (s32 i = 0; i < 9; ++i) {
PD_SWAP_VAL(texts[i]);
}
}
void preprocessTexturesList(u8 *data, u32 size)
{
struct texture *tex = (struct texture *)data;

2
port/src/romdata.c
View File

@ -70,7 +70,7 @@ static struct romfile fileSlots[ROMDATA_MAX_FILES];
ROMSEG_DECL_SEG(mpstringsF, 0x7df820, 0x3700, NULL ) \
ROMSEG_DECL_SEG(mpstringsS, 0x7e2f20, 0x3700, NULL ) \
ROMSEG_DECL_SEG(mpstringsI, 0x7e6620, 0x3700, NULL ) \
ROMSEG_DECL_SEG(firingrange, 0x7e9d20, 0x1550, preprocessFiringRange ) \
ROMSEG_DECL_SEG(firingrange, 0x7e9d20, 0x1550, NULL ) \
ROMSEG_DECL_SEG(fonttahoma, 0x7f7860, 0x0, preprocessFont ) \
ROMSEG_DECL_SEG(fontnumeric, 0x7f8b20, 0x0, preprocessFont ) \
ROMSEG_DECL_SEG(fonthandelgothicsm, 0x7f9d30, 0x0, preprocessFont ) \

4
src/game/training.c
View File

@ -481,7 +481,7 @@ void *frLoadRomData(u32 len)
g_FrRomData = mempAlloc(ALIGN16(len), MEMPOOL_STAGE);
if (g_FrRomData) {
return dmaExecWithAutoAlign(g_FrRomData, (romptr_t) &_firingrangeSegmentRomStart, len);
return dmaExecWithAutoAlign(g_FrRomData, (romptr_t) REF_SEG _firingrangeSegmentRomStart, len);
}
return NULL;
@ -1073,7 +1073,7 @@ void frUnlockDoor(void)
void frLoadData(void)
{
if (!g_FrDataLoaded) {
s32 len = (s32)&_firingrangeSegmentRomEnd - (s32)&_firingrangeSegmentRomStart;
s32 len = (s32) REF_SEG _firingrangeSegmentRomEnd - (s32) REF_SEG _firingrangeSegmentRomStart;
s32 index = 0;
u32 i;
u32 numscripts = 1;