MGislv
/
ooot
mirror of https://github.com/blawar/ooot.git
1
0
Fork 0
Code Releases Wiki Activity

Fix ucode naming and remove data that is no longer extracted

This commit is contained in:
Zelllll 2022-04-14 14:37:33 -05:00
parent 0bd31855c6
commit e6335f035d
12 changed files with 44 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/rsp.h
View File

@ -1,10 +1,10 @@
#pragma once
#include "ultra64/types.h"
extern u8 D_801579A0[0x390];
extern u8 D_80113070[0x18C0];
extern u8 D_80009320[0xD0];
extern u8 D_80157580[0x420];
extern u8 D_80155F50[0x1630];
extern u8 rspS2DEXData[0x390];
extern u8 rspS2DEXText[0x18C0];
extern u8 rspBootText[0xD0];
extern u8 rspF3DZEXData[0x420];
extern u8 rspF3DZEXText[0x1630];
extern u8 D_800093F0[0x20];
extern u64 D_801120C0[0x1F6];
extern u64 rspAspMainText[0x1F6];

16
include/variables.h
View File

@ -11,7 +11,7 @@ extern u32 osResetType;
extern u32 osMemSize;
extern u8 osAppNmiBuffer[0x40];
extern u8 D_80009320[];
extern u8 rspBootText[];
extern u8 D_800093F0[];
extern s8 D_80009430;
extern u32 D_80009460;
@ -55,9 +55,9 @@ extern u32 __osBaseCounter;
extern u32 __osViIntrCount;
extern u32 __osTimerCounter;
extern DmaEntry gDmaDataTable[0x60C];
extern u64 D_801120C0[];
extern u8 D_80113070[];
extern u64 gJpegUCode[];
extern u64 rspAspMainText[];
extern u8 rspS2DEXText[];
extern u64 rspJpegText[];
extern EffectSsOverlay gEffectSsOverlayTable[EFFECT_SS_TYPE_MAX];
extern Gfx D_80116280[];
extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX]; // original name: "actor_dlftbls" 801162A0
@ -157,10 +157,10 @@ extern u8 gSoundFontTable[];
extern u8 gSequenceFontTable[];
extern u8 gSequenceTable[];
extern u8 gSampleBankTable[];
extern u8 D_80155F50[];
extern u8 D_80157580[];
extern u8 D_801579A0[];
extern u64 gJpegUCodeData[];
extern u8 rspF3DZEXText[];
extern u8 rspF3DZEXData[];
extern u8 rspS2DEXData[];
extern u64 rspJpegData[];
extern SaveContext gSaveContext;
extern GameInfo* gGameInfo;

4
include/z64jpeg.h
View File

@ -95,5 +95,5 @@ s32 JpegDecoder_ProcessMcu(JpegHuffmanTable* hTable0, JpegHuffmanTable* hTable1,
s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* outZeroCount);
u16 JpegDecoder_ReadBits(u8 len);
extern u64 gJpegUCode[];
extern u64 gJpegUCodeData[];
extern u64 rspJpegText[];
extern u64 rspJpegData[];

30
roms/EUR_GCD/config.json
View File

@ -1519,22 +1519,6 @@
"offset": "9FF0",
"size": "20"
},
"D_80133408": {
"offset": "BAA5A8",
"size": "1"
},
"D_8013340C": {
"offset": "BAA5AC",
"size": "1"
},
"D_80133410": {
"offset": "BAA5B0",
"size": "4"
},
"D_80133418": {
"offset": "BAA5B8",
"size": "1"
},
"MAP_MARK_RAM": {
"offset": "80858B70"
},
@ -1544,10 +1528,6 @@
"fra_message_entry_table_addr": {
"offset": "00BC87F8"
},
"gAudioSpecId": {
"offset": "BAA5B4",
"size": "1"
},
"gMapMarkDataTable": {
"offset": "8085F5E8"
},
@ -1600,7 +1580,7 @@
"offset": "BCEED0",
"size": "60"
},
"rspJpegTextStart": {
"rspJpegText": {
"offset": "B8BAD0",
"size": "AF0"
},
@ -1618,14 +1598,6 @@
"sMarkChestVtxPointer": {
"offset": "80830650"
},
"sSeqCmdRdPos": {
"offset": "BAA5A4",
"size": "4"
},
"sSeqCmdWrPos": {
"offset": "BAA5A0",
"size": "4"
},
"staff_message_entry_table_addr": {
"offset": "00BCA908"
},

30
roms/EUR_MQD/config.json
View File

@ -1547,22 +1547,6 @@
"offset": "9FF0",
"size": "20"
},
"D_80133408": {
"offset": "BAA5A8",
"size": "1"
},
"D_8013340C": {
"offset": "BAA5AC",
"size": "1"
},
"D_80133410": {
"offset": "BAA5B0",
"size": "4"
},
"D_80133418": {
"offset": "BAA5B8",
"size": "1"
},
"MAP_MARK_RAM": {
"offset": "80858B70"
},
@ -1572,10 +1556,6 @@
"fra_message_entry_table_addr": {
"offset": "00BC87F8"
},
"gAudioSpecId": {
"offset": "BAA5B4",
"size": "1"
},
"gMapMarkDataTable": {
"offset": "8085F5E8"
},
@ -1628,7 +1608,7 @@
"offset": "BCEED0",
"size": "60"
},
"rspJpegTextStart": {
"rspJpegText": {
"offset": "B8BAD0",
"size": "AF0"
},
@ -1646,14 +1626,6 @@
"sMarkChestVtxPointer": {
"offset": "80830650"
},
"sSeqCmdRdPos": {
"offset": "BAA5A4",
"size": "4"
},
"sSeqCmdWrPos": {
"offset": "BAA5A0",
"size": "4"
},
"staff_message_entry_table_addr": {
"offset": "00BCA908"
},

30
roms/PAL_1.0/config.json
View File

@ -1524,22 +1524,6 @@
"offset": "9FF0",
"size": "20"
},
"D_80133408": {
"offset": "0",
"size": "0"
},
"D_8013340C": {
"offset": "0",
"size": "0"
},
"D_80133410": {
"offset": "0",
"size": "0"
},
"D_80133418": {
"offset": "0",
"size": "0"
},
"MAP_MARK_RAM": {
"offset": "80857380"
},
@ -1549,10 +1533,6 @@
"fra_message_entry_table_addr": {
"offset": "00B86514"
},
"gAudioSpecId": {
"offset": "0",
"size": "0"
},
"gMapMarkDataTable": {
"offset": "8085DE6C"
},
@ -1605,7 +1585,7 @@
"offset": "B8A490",
"size": "60"
},
"rspJpegTextStart": {
"rspJpegText": {
"offset": "B5C430",
"size": "AF0"
},
@ -1623,14 +1603,6 @@
"sMarkChestVtxPointer": {
"offset": "8082F450"
},
"sSeqCmdRdPos": {
"offset": "0",
"size": "0"
},
"sSeqCmdWrPos": {
"offset": "0",
"size": "0"
},
"staff_message_entry_table_addr": {
"offset": "00B88624"
},

10
src/code/audio_rsp.cpp
View File

@ -41,7 +41,7 @@ AudioTask* func_800E4FE0(void)
return getAudioTask();
}
extern u32 rspAspMainDataStart[0x5C * 2];
extern u32 rspAspMainData[0x5C * 2];
AudioTask* getAudioTask()
{
@ -169,11 +169,11 @@ AudioTask* getAudioTask()
task = &gAudioContext.currTask->task.t;
task->type = M_AUDTASK;
task->flags = 0;
task->ucode_boot = D_801120C0;
task->ucode_boot = rspAspMainText;
task->ucode_boot_size = 0x1000;
task->ucode_data_size = (sizeof(rspAspMainDataStart) * sizeof(u64)) - 1;
task->ucode = D_801120C0;
task->ucode_data = (u64*)rspAspMainDataStart;
task->ucode_data_size = (sizeof(rspAspMainData) * sizeof(u64)) - 1;
task->ucode = rspAspMainText;
task->ucode_data = (u64*)rspAspMainData;
task->ucode_size = 0x1000;
task->dram_stack = NULL;
task->dram_stack_size = 0;

12
src/code/sys_ucode.cpp
View File

@ -3,17 +3,17 @@
#include "rsp.h"
#include "def/sys_ucode.h"
u64* D_8012DBA0 = (u64*)&D_80155F50;
u64* D_8012DBA4 = (u64*)&D_80157580;
u64* D_8012DBA0 = (u64*)&rspF3DZEXText;
u64* D_8012DBA4 = (u64*)&rspF3DZEXData;
u64* SysUcode_GetUCodeBoot(void)
{
return (u64*)&D_80009320;
return (u64*)&rspBootText;
}
u64 SysUcode_GetUCodeBootSize(void)
{
return sizeof(D_80009320);
return sizeof(rspBootText);
}
u64* SysUcode_GetUCode(void)
@ -23,7 +23,7 @@ u64* SysUcode_GetUCode(void)
u64 SysUcode_GetUCodeSize(void)
{
return sizeof(D_80155F50);
return sizeof(rspF3DZEXText);
}
u64* SysUcode_GetUCodeData(void)
@ -33,5 +33,5 @@ u64* SysUcode_GetUCodeData(void)
u64 SysUcode_GetUCodeDataSize(void)
{
return sizeof(D_80157580);
return sizeof(rspF3DZEXData);
}

4
src/code/z_jpeg.cpp
View File

@ -35,9 +35,9 @@ void Jpeg_ScheduleDecoderTask(JpegContext* ctx)
0, // flags
NULL, // ucode_boot
0, // ucode_boot_size
gJpegUCode, // ucode
rspJpegText, // ucode
0x1000, // ucode_size
gJpegUCodeData, // ucode_data
rspJpegData, // ucode_data
0x800, // ucode_data_size
NULL, // dram_stack
0, // dram_stack_size

4
src/code/z_room.cpp
View File

@ -416,7 +416,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags)
if(sp98)
{
// gSPLoadUcodeL(POLY_OPA_DISP++, rspS2DEX)?
gSPLoadUcodeEx(POLY_OPA_DISP++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800);
gSPLoadUcodeEx(POLY_OPA_DISP++, OS_K0_TO_PHYSICAL(rspS2DEXText), OS_K0_TO_PHYSICAL(rspS2DEXData), 0x800);
{
Vec3f sp60;
@ -520,7 +520,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags)
if(sp94)
{
// gSPLoadUcodeL(POLY_OPA_DISP++, rspS2DEX)?
gSPLoadUcodeEx(POLY_OPA_DISP++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800);
gSPLoadUcodeEx(POLY_OPA_DISP++, OS_K0_TO_PHYSICAL(rspS2DEXText), OS_K0_TO_PHYSICAL(rspS2DEXData), 0x800);
{
Vec3f sp5C;

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.cpp
View File

@ -585,7 +585,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx
void* mapImage = gWorldMapImageTex;
// gSPLoadUcodeL(sp1CC++, rspS2DEX)?
gSPLoadUcodeEx(sp1CC++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800);
gSPLoadUcodeEx(sp1CC++, OS_K0_TO_PHYSICAL(rspS2DEXText), OS_K0_TO_PHYSICAL(rspS2DEXData), 0x800);
func_8009638C(&sp1CC, mapImage, gWorldMapImageTLUT, 216, 128, G_IM_FMT_CI, G_IM_SIZ_8b, 0x8000, 256, HREG(13) / 100.0f, HREG(14) / 100.0f);

27
tools/extract_z64_variables.py
View File

@ -689,28 +689,19 @@ sections = {'misc/rsp.h': [
Section('gSequenceFontTable', conf.sections.gSequenceFontTable.offset, conf.sections.gSequenceFontTable.size, 2),
Table('gSequenceTable', conf.sections.gSequenceTable.offset, conf.sections.gSequenceTable.size, 'baserom/Audioseq'),
Table('gSampleBankTable', conf.sections.gSampleBankTable.offset, conf.sections.gSampleBankTable.size, 'baserom/Audiotable'),
Section('rspAspMainDataStart', conf.sections.rspAspMainData.offset, conf.sections.rspAspMainData.size, 4),
Section('D_80155F50', conf.sections.rspF3DZEXText.offset, conf.sections.rspF3DZEXText.size, 1),
Section('D_80157580', conf.sections.rspF3DZEXData.offset, conf.sections.rspF3DZEXData.size, 1),
Section('D_801579A0', conf.sections.rspS2DEXData.offset, conf.sections.rspS2DEXData.size, 1),
Section('gJpegUCodeData', conf.sections.rspJpegData.offset, conf.sections.rspJpegData.size),
Section('D_801120C0', conf.sections.rspAspMainText.offset, conf.sections.rspAspMainText.size, 8),
Section('D_80113070', conf.sections.rspS2DEXText.offset, conf.sections.rspS2DEXText.size, 1),
Section('gJpegUCode', conf.sections.rspJpegTextStart.offset, conf.sections.rspJpegTextStart.size, 8)
Section('rspAspMainData', conf.sections.rspAspMainData.offset, conf.sections.rspAspMainData.size, 4),
Section('rspF3DZEXText', conf.sections.rspF3DZEXText.offset, conf.sections.rspF3DZEXText.size, 1),
Section('rspF3DZEXData', conf.sections.rspF3DZEXData.offset, conf.sections.rspF3DZEXData.size, 1),
Section('rspS2DEXData', conf.sections.rspS2DEXData.offset, conf.sections.rspS2DEXData.size, 1),
Section('rspJpegData', conf.sections.rspJpegData.offset, conf.sections.rspJpegData.size),
Section('rspAspMainText', conf.sections.rspAspMainText.offset, conf.sections.rspAspMainText.size, 8),
Section('rspS2DEXText', conf.sections.rspS2DEXText.offset, conf.sections.rspS2DEXText.size, 1),
Section('rspJpegText', conf.sections.rspJpegText.offset, conf.sections.rspJpegText.size, 8)
],
'misc/rsp_boot.h': [
Section('D_80009320', conf.sections.rspBootText.offset, conf.sections.rspBootText.size, 1),
Section('rspBootText', conf.sections.rspBootText.offset, conf.sections.rspBootText.size, 1),
Section('D_800093F0', conf.sections.D_800093F0.offset, conf.sections.D_800093F0.size, 1)
],
'misc/code_800F9280.h': [
Section('sSeqCmdWrPos', conf.sections.sSeqCmdWrPos.offset, conf.sections.sSeqCmdWrPos.size, 1),
Section('sSeqCmdRdPos', conf.sections.sSeqCmdRdPos.offset, conf.sections.sSeqCmdRdPos.size, 1),
Section('D_80133408', conf.sections.D_80133408.offset, conf.sections.D_80133408.size, 1),
Section('D_8013340C', conf.sections.D_8013340C.offset, conf.sections.D_8013340C.size, 1),
Section('D_80133410', conf.sections.D_80133410.offset, conf.sections.D_80133410.size, 1),
Section('gAudioSpecId', conf.sections.gAudioSpecId.offset, conf.sections.gAudioSpecId.size, 1),
Section('D_80133418', conf.sections.D_80133418.offset, conf.sections.D_80133418.size, 1),
]
}
createDir(assetPath('misc'))