github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

DPad items

Browse source
This commit is contained in:
rozlette 2022-06-22 21:24:20 -05:00 • committed by louist103
commit fd06827e2b
17 changed files with 582 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/include/macros.h
View file

@ -76,6 +76,10 @@
? gSaveContext.equips.buttonItems[(button) + 1] \
: ITEM_NONE)
#define DPAD_ITEM(button) ((gSaveContext.buttonStatus[(button) + 5] != BTN_DISABLED) \
? gSaveContext.equips.buttonItems[(button) + 4] \
: ITEM_NONE)
#define CHECK_BTN_ALL(state, combo) (~((state) | ~(combo)) == 0)
#define CHECK_BTN_ANY(state, combo) (((state) & (combo)) != 0)

4
soh/include/z64.h
View file

@ -705,6 +705,10 @@ typedef struct {
/* 0x024C */ u16 cDownAlpha;
/* 0x024E */ u16 cRightAlpha;
/* 0x0250 */ u16 healthAlpha; // also max C-Up alpha
/* 0x024E */ u16 dpadUpAlpha;
/* 0x024E */ u16 dpadDownAlpha;
/* 0x024E */ u16 dpadLeftAlpha;
/* 0x024E */ u16 dpadRightAlpha;
/* 0x0252 */ u16 magicAlpha; // also Rupee and Key counters alpha
/* 0x0254 */ u16 minimapAlpha;
/* 0x0256 */ s16 startAlpha;

15
soh/include/z64interface.h
View file

@ -22,6 +22,21 @@
#define C_UP_BUTTON_X 254
#define C_UP_BUTTON_Y 16
#define DPAD_UP_X 279
#define DPAD_UP_Y 47
#define DPAD_DOWN_X 279
#define DPAD_DOWN_Y 79
#define DPAD_LEFT_X 263
#define DPAD_LEFT_Y 63
#define DPAD_RIGHT_X 295
#define DPAD_RIGHT_Y 63
#define DPAD_X 271
#define DPAD_Y 55
/**
* These are the colors for the hearts in the interface. The prim color is the red color of the heart
* for the base hearts, while the prim color for the double defense hearts is the white outline. The

6
soh/include/z64save.h
View file

@ -5,8 +5,8 @@
#include "z64math.h"
typedef struct {
/* 0x00 */ u8 buttonItems[4];
/* 0x04 */ u8 cButtonSlots[3];
/* 0x00 */ u8 buttonItems[8];
/* 0x04 */ u8 cButtonSlots[7];
/* 0x08 */ u16 equipment;
} ItemEquips; // size = 0x0A
@ -125,7 +125,7 @@ typedef struct {
/* 0x13DA */ s16 timerY[2];
/* 0x13E0 */ u8 seqId;
/* 0x13E1 */ u8 natureAmbienceId;
/* 0x13E2 */ u8 buttonStatus[5];
/* 0x13E2 */ u8 buttonStatus[9];
/* 0x13E7 */ u8 unk_13E7; // alpha related
/* 0x13E8 */ u16 unk_13E8; // alpha type?
/* 0x13EA */ u16 unk_13EA; // also alpha type?