mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

convert z_debug.data

Browse source
This commit is contained in:
mzxrules 2020-03-18 12:31:36 -04:00
parent 32fe030b42
commit dd4f67c3f5
4 changed files with 56 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -23,6 +23,7 @@ out.txt
# Tool artifacts
tools/ido7.1_compiler/*
tools/mipspro7.2_compiler/
tools/overlayhelpers/batchdisasm/output/*
tools/overlayhelpers/batchdisasm/output2/*
tools/overlayhelpers/batchdisasm/mipsdisasm/*
@ -42,4 +43,3 @@ tools/asmsplitter/c/*
#Per-user configuration
.python-version
/tools/mipspro7.2_compiler/

20
data/z_debug.data.s
View file

@ -1,20 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .data
glabel D_8011E0B0
.incbin "baserom.z64", 0xB95250, 0x4
glabel D_8011E0B4
.incbin "baserom.z64", 0xB95254, 0x20
glabel D_8011E0D4
.incbin "baserom.z64", 0xB95274, 0x74
glabel D_8011E148
.incbin "baserom.z64", 0xB952E8, 0x28

1
spec
View file

@ -308,7 +308,6 @@ beginseg
include "build/src/code/z_common_data.o"
include "build/data/z_common_data.bss.o"
include "build/src/code/z_debug.o"
include "build/data/z_debug.data.o"
include "build/src/code/z_debug_display.o"
include "build/src/code/z_demo.o"
include "build/src/code/code_80069420.o"

69
src/code/z_debug.c
View file

@ -23,9 +23,6 @@
#define REG_N 96
#define PAGE_N 16
GameInfo* gGameInfo;
int D_8015FA94; //no known symbols
typedef struct
{
u8 x;
@ -34,19 +31,61 @@ typedef struct
char text[0x15];
} PrintTextBuffer;
PrintTextBuffer D_8015FA98[0x16];
//s16 D_8011E0B0 //PrintTextBuffer index
//#define D_8015FC18 D_8015FA98[0x10]
typedef struct
{
u16 push;
u16 held;
} InputCombo;
extern InputCombo D_8011E0D4[REG_GROUP_TOTAL]; //register button combos
GameInfo* gGameInfo;
int D_8015FA94; //no known symbols
PrintTextBuffer D_8015FA98[0x16];
extern char D_8011E148[];
s16 D_8011E0B0 = 0; //PrintTextBuffer index
Color_RGBA8 printTextColors[] = {
{ 0xFF, 0xFF, 0x20, 0xC0 },
{ 0xFF, 0x96, 0x80, 0xC0 },
{ 0x80, 0x60, 0x00, 0x40 },
{ 0xC0, 0x80, 0x10, 0x80 },
{ 0xFF, 0xC0, 0x20, 0x80 },
{ 0xE6, 0xE6, 0xDC, 0x40 },
{ 0x80, 0x96, 0xFF, 0x80 },
{ 0x80, 0xFF, 0x20, 0x80 },
};
InputCombo inputCombos[REG_GROUP_TOTAL] = {
{ BUTTON_L, BUTTON_C_UP },
{ BUTTON_L, BUTTON_C_LEFT },
{ BUTTON_L, BUTTON_C_DOWN },
{ BUTTON_L, BUTTON_A },
{ BUTTON_R, BUTTON_C_DOWN },
{ BUTTON_L, BUTTON_C_RIGHT },
{ BUTTON_L, BUTTON_R },
{ BUTTON_L, BUTTON_D_LEFT },
{ BUTTON_L, BUTTON_D_RIGHT },
{ BUTTON_L, BUTTON_D_UP },
{ BUTTON_L, BUTTON_B },
{ BUTTON_L, BUTTON_Z },
{ BUTTON_L, BUTTON_D_DOWN },
{ BUTTON_R, BUTTON_A },
{ BUTTON_R, BUTTON_B },
{ BUTTON_R, BUTTON_Z },
{ BUTTON_R, BUTTON_L },
{ BUTTON_R, BUTTON_C_UP },
{ BUTTON_R, BUTTON_C_RIGHT },
{ BUTTON_R, BUTTON_D_LEFT },
{ BUTTON_R, BUTTON_C_LEFT },
{ BUTTON_R, BUTTON_START },
{ BUTTON_L, BUTTON_START },
{ BUTTON_R, BUTTON_D_RIGHT },
{ BUTTON_R, BUTTON_D_UP },
{ BUTTON_START, BUTTON_R },
{ BUTTON_START, BUTTON_A },
{ BUTTON_START, BUTTON_B },
{ BUTTON_START, BUTTON_C_RIGHT },
};
char regChar[] = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb";
//initialize GameInfo
void func_800636C0()
@ -65,14 +104,13 @@ void func_800636C0()
}
}
//Called when free movement is active
//Called when free movement is active.
//8011D394 to enable camera debugger
void func_8006375C(s32 arg0, s32 arg1, float* d_80855320)
{
}
//8011D394 enable camera debugger
#ifdef NON_MATCHING //regalloc
//Copy Camera Debugger Text
void func_8006376C(u8 x, u8 y, u8 colorId, const char* text)
@ -122,7 +160,7 @@ void func_80063828(GfxPrint* gfxPrint)
buffer = &D_8015FA98[i];
text = buffer->text;
color = &D_8011E0B4[buffer->colorId];
color = &printTextColors[buffer->colorId];
GfxPrint_SetColor(gfxPrint, color->r, color->g, color->b, color->a);
GfxPrint_SetPos(gfxPrint, buffer->x, buffer->y);
GfxPrint_Printf(gfxPrint, "%s", text);
@ -145,7 +183,7 @@ void func_8006390C(Input* input) {
if (!~(input->raw.pad | ~BUTTON_L) ||
!~(input->raw.pad | ~BUTTON_R) ||
!~(input->raw.pad | ~BUTTON_START)) {
input_combo = D_8011E0D4;
input_combo = inputCombos;
for (i = 0; i < REG_GROUP_TOTAL; i++)
{
if (~(~input_combo->push | input->raw.pad) ||
@ -217,7 +255,6 @@ void func_8006390C(Input* input) {
iREG(0) = 0;
func_800AA000(0, iREG(1), iREG(2), iREG(3));
}
}
}
}
@ -236,7 +273,7 @@ void func_80063C04(GfxPrint* gfxPrint)
//set up register name string
reg_name[0] = 'R';
reg_name[1] = D_8011E148[gGameInfo->reg_group]; //r_group type char
reg_name[1] = regChar[gGameInfo->reg_group]; //r_group type char
reg_name[2] = '\0';
GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80);