MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-07-04 18:13:37 +00:00
Code Releases Wiki Activity

tweak defines

Browse Source
This commit is contained in:
mzxrules 2020-03-19 20:10:32 -04:00
parent 8063249af4
commit 858e937519
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/regs.h
View File

@ -2,7 +2,9 @@
#define _REGS_H_ #define _REGS_H_
#define REG_GROUPS 29 //number of REG groups, i.e. REG, SREG, OREG, etc. #define REG_GROUPS 29 //number of REG groups, i.e. REG, SREG, OREG, etc.
#define REG_PER_GROUP 96 #define REG_PAGES 6
#define REG_PER_PAGE 16
#define REG_PER_GROUP REG_PAGES * REG_PER_PAGE
#define BASE_REG(n, r) gGameInfo->data[n * REG_PER_GROUP + r] #define BASE_REG(n, r) gGameInfo->data[n * REG_PER_GROUP + r]

28
src/code/z_debug.c
View File

@ -5,8 +5,6 @@
#include <regs.h> #include <regs.h>
#include <PR/os_cont.h> #include <PR/os_cont.h>
#define PAGE_N 16
typedef struct typedef struct
{ {
u8 x; u8 x;
@ -162,7 +160,7 @@ void func_8006390C(Input* input) {
InputCombo* input_combo; InputCombo* input_combo;
s32 i; s32 i;
regGroup = (gGameInfo->regGroup * (REG_PER_GROUP / PAGE_N) + gGameInfo->regPage) * PAGE_N - PAGE_N; regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE;
dpad = input->raw.pad & 0xF00; dpad = input->raw.pad & 0xF00;
if (!~(input->raw.pad | ~L_TRIG) || if (!~(input->raw.pad | ~L_TRIG) ||
!~(input->raw.pad | ~R_TRIG) || !~(input->raw.pad | ~R_TRIG) ||
@ -180,7 +178,7 @@ void func_8006390C(Input* input) {
if (i < REG_GROUPS) { if (i < REG_GROUPS) {
if (i == gGameInfo->regGroup) { if (i == gGameInfo->regGroup) {
gGameInfo->regPage = (gGameInfo->regPage + 1) % 7; gGameInfo->regPage = (gGameInfo->regPage + 1) % (REG_PAGES + 1);
return; return;
} }
gGameInfo->regGroup = i; gGameInfo->regGroup = i;
@ -190,12 +188,12 @@ void func_8006390C(Input* input) {
else { else {
switch (gGameInfo->regPage - 1) switch (gGameInfo->regPage - 1)
{ {
case 0: case 0:
case 1: case 1:
case 2: case 2:
case 3: case 3:
case 4: case 4:
case 5: case 5:
if (dpad == gGameInfo->dpadLast) { if (dpad == gGameInfo->dpadLast) {
gGameInfo->repeat--; gGameInfo->repeat--;
@ -226,12 +224,12 @@ void func_8006390C(Input* input) {
if (dpad & U_JPAD) { if (dpad & U_JPAD) {
gGameInfo->regCur--; gGameInfo->regCur--;
if (gGameInfo->regCur < 0) { if (gGameInfo->regCur < 0) {
gGameInfo->regCur = PAGE_N - 1; gGameInfo->regCur = REG_PER_PAGE - 1;
} }
} }
else if (dpad & D_JPAD) { else if (dpad & D_JPAD) {
gGameInfo->regCur++; gGameInfo->regCur++;
if (gGameInfo->regCur >= PAGE_N) { if (gGameInfo->regCur >= REG_PER_PAGE) {
gGameInfo->regCur = 0; gGameInfo->regCur = 0;
} }
} }
@ -252,8 +250,8 @@ void func_80063C04(GfxPrint* gfxPrint)
s32 test; //removing affects stack s32 test; //removing affects stack
char name[3]; char name[3];
page = (gGameInfo->regPage * PAGE_N) - PAGE_N; page = (gGameInfo->regPage * REG_PER_PAGE) - REG_PER_PAGE;
regGroup = (gGameInfo->regGroup * (REG_PER_GROUP / PAGE_N) + gGameInfo->regPage) * PAGE_N - PAGE_N; regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE;
//set up register name string //set up register name string
name[0] = 'R'; name[0] = 'R';
@ -261,7 +259,7 @@ void func_80063C04(GfxPrint* gfxPrint)
name[2] = '\0'; name[2] = '\0';
GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80); GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80);
for (i = 0; i != PAGE_N; i++) for (i = 0; i != REG_PER_PAGE; i++)
{ {
if (i == gGameInfo->regCur) if (i == gGameInfo->regCur)
{ {