izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup macros

Browse Source
This commit is contained in:
engineer124
2022-04-23 12:17:26 +10:00
parent 88769bd7c1
commit ad861d29d4
7 changed files with 146 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64.h
+1 -1
View File
@@ -67,7 +67,7 @@ typedef enum {
/* 1 */ EQUIP_SLOT_C_LEFT,
/* 2 */ EQUIP_SLOT_C_DOWN,
/* 3 */ EQUIP_SLOT_C_RIGHT,
/* 4 */ EQUIP_SLOT_UNUSED
/* 4 */ EQUIP_SLOT_A
} EquipSlot;
typedef struct {
include/z64item.h
+9 -4
View File
@@ -27,7 +27,15 @@ typedef enum {
/* 1 */ EQUIP_VALUE_SHIELD_HERO,
/* 2 */ EQUIP_VALUE_SHIELD_MIRROR,
/* 3 */ EQUIP_VALUE_SHIELD_MAX
} EquipValueShield;
} EquipValueShield;
typedef enum {
/* 0 */ EQUIP_VALUE_TUNIC_NONE,
/* 1 */ EQUIP_VALUE_TUNIC_KOKIRI,
/* 2 */ EQUIP_VALUE_TUNIC_GORON,
/* 3 */ EQUIP_VALUE_TUNIC_ZORA,
/* 4 */ EQUIP_VALUE_TUNIC_MAX
} EquipValueTunic; // Remnant of OoT
typedef enum {
/* 0 */ UPG_QUIVER,
@@ -288,9 +296,6 @@ typedef enum {
#define BOTTLE_FIRST 0
#define BOTTLE_MAX 6
#define BOTTLE_FIRST 0
#define BOTTLE_MAX 6
typedef enum {
/* 0x00 */ GI_NONE,
/* 0x01 */ GI_RUPEE_GREEN,
include/z64save.h
+1 -1
View File
@@ -129,7 +129,7 @@ typedef struct Save {
/* 0x000C */ u16 time; // "zelda_time"
/* 0x000E */ u16 owlSaveLocation;
/* 0x0010 */ s32 isNight; // "asahiru_fg"
/* 0x0014 */ u32 daySpeed; // "change_zelda_time"
/* 0x0014 */ s32 daySpeed; // "change_zelda_time"
/* 0x0018 */ s32 day; // "totalday"
/* 0x001C */ s32 daysElapsed; // "eventday"
/* 0x0020 */ u8 playerForm; // "player_character"
src/code/code_8012EC80.c
+1 -1
View File
@@ -475,7 +475,7 @@ u16 gScenesPerRegion[11][27] = {
};
s32 Inventory_GetBtnBItem(GlobalContext* globalCtx) {
if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) {
return ITEM_NONE;
} else if (gSaveContext.unk_1015 == ITEM_NONE) {
return ITEM_NONE;
src/code/z_game_over.c
+1 -1
View File
@@ -55,7 +55,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_UNUSED] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_A] = BTN_ENABLED;
gSaveContext.unk_3F1E = 0;
gSaveContext.unk_3F20 = 0;
gSaveContext.unk_3F22 = 0;
src/code/z_parameter.c
+132 -131
View File
File diff suppressed because it is too large Load Diff
src/overlays/gamestates/ovl_select/z_select.c
+1 -1
View File
@@ -26,7 +26,7 @@ void Select_LoadGame(SelectContext* this, u32 entranceIndex, s32 opt) {
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_UNUSED] = BTN_ENABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_A] = BTN_ENABLED;
gSaveContext.unk_3F1E = 0;
gSaveContext.unk_3F20 = 0;
gSaveContext.unk_3F22 = 0;