mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Match NTSC z_parameter.c and z_construct.c (#1987)

Browse source 
* Match NTSC z_parameter.c and z_construct.c

* Comment which REG collide

* Use new REGs everywhere

* Use new REGs everywhere for real
This commit is contained in:
cadmic 2024-07-17 15:52:38 -07:00 • committed by GitHub
parent 4fbb48177f
commit c83b93aae4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 88 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/code/z_construct.c
View file

@ -328,6 +328,17 @@ void Regs_InitDataImpl(void) {
R_C_BTN_COLOR(2) = 0;
ZREG(46) = 1;
ZREG(47) = 1;
#if OOT_NTSC
R_START_LABEL_DD(0) = 86;
R_START_LABEL_DD(1) = 100;
R_START_LABEL_WIDTH = 0;
R_START_LABEL_HEIGHT = 0;
R_START_LABEL_Y(0) = 21;
R_START_LABEL_Y(1) = 20;
R_START_LABEL_X(0) = 122;
R_START_LABEL_X(1) = 120;
#else
R_START_LABEL_DD(0) = 100;
R_START_LABEL_DD(1) = 89;
R_START_LABEL_DD(2) = 92;
@ -337,6 +348,8 @@ void Regs_InitDataImpl(void) {
R_START_LABEL_X(0) = 120;
R_START_LABEL_X(1) = 119;
R_START_LABEL_X(2) = 119;
#endif
ZREG(61) = 1;
R_C_UP_BTN_X = C_UP_BUTTON_X;
R_C_UP_BTN_Y = C_UP_BUTTON_Y;
@ -464,6 +477,18 @@ void Regs_InitDataImpl(void) {
WREG(5) = 3;
WREG(6) = 8;
WREG(7) = 0;
#if OOT_NTSC
R_B_LABEL_SCALE(0) = 100;
R_B_LABEL_SCALE(1) = 109;
R_B_LABEL_X(0) = 151;
R_B_LABEL_X(1) = 148;
R_B_LABEL_Y(0) = 23;
R_B_LABEL_Y(1) = 22;
R_A_LABEL_Z(0) = -380;
R_A_LABEL_Z(1) = -350;
#else
// Same as above, although these regs are now unused in PAL versions
WREG(8) = 100;
WREG(9) = 109;
WREG(10) = 151;
@ -472,6 +497,8 @@ void Regs_InitDataImpl(void) {
WREG(13) = 22;
WREG(14) = -380;
WREG(15) = -350;
#endif
WREG(16) = -175;
WREG(17) = 155;
WREG(18) = 10;
@ -492,18 +519,20 @@ void Regs_InitDataImpl(void) {
WREG(33) = 60;
WREG(35) = 0;
WREG(36) = 0;
WREG(37) = 100;
WREG(38) = 99;
WREG(39) = 109;
#if OOT_PAL
R_B_LABEL_SCALE(0) = 100;
R_B_LABEL_SCALE(1) = 99;
R_B_LABEL_SCALE(2) = 109;
R_B_LABEL_X(0) = B_BUTTON_X - 9;
R_B_LABEL_X(1) = B_BUTTON_X - 11;
R_B_LABEL_X(2) = B_BUTTON_X - 12;
R_B_LABEL_Y(0) = B_BUTTON_Y + 6;
R_B_LABEL_Y(1) = B_BUTTON_Y + 5;
R_B_LABEL_Y(2) = B_BUTTON_Y + 5;
WREG(46) = -380;
WREG(47) = -360;
WREG(48) = -350;
R_A_LABEL_Z(0) = -380;
R_A_LABEL_Z(1) = -360;
R_A_LABEL_Z(2) = -350;
WREG(49) = -48;
WREG(50) = 16;
WREG(51) = -62;
@ -522,6 +551,8 @@ void Regs_InitDataImpl(void) {
WREG(64) = -37;
WREG(65) = 30;
WREG(66) = -50;
#endif
R_DGN_MINIMAP_X = 204;
R_DGN_MINIMAP_Y = 140;
WREG(87) = 80;