mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 17:54:15 +00:00
Code Issues Projects Releases Wiki Activity

Highscores array (#600)

Browse source 
* Highscores

* Review suggestions

Co-authored-by: Thar0 <maximilianc64@gmail.com>
This commit is contained in:
Tharo 2021-01-05 19:57:18 +00:00 committed by GitHub
parent 510b3c4bd5
commit 2a13d71848
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/macros.h
View file

@ -45,6 +45,8 @@
#define CHECK_QUEST_ITEM(item) (gBitFlags[item] & gSaveContext.inventory.questItems) #define CHECK_QUEST_ITEM(item) (gBitFlags[item] & gSaveContext.inventory.questItems)
#define CHECK_DUNGEON_ITEM(item, dungeonIndex) (gSaveContext.inventory.dungeonItems[dungeonIndex] & gBitFlags[item]) #define CHECK_DUNGEON_ITEM(item, dungeonIndex) (gSaveContext.inventory.dungeonItems[dungeonIndex] & gBitFlags[item])
#define HIGH_SCORE(score) (gSaveContext.highScores[score])
#define B_BTN_ITEM ((gSaveContext.buttonStatus[0] == ITEM_NONE) \ #define B_BTN_ITEM ((gSaveContext.buttonStatus[0] == ITEM_NONE) \
? ITEM_NONE \ ? ITEM_NONE \
: (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) \ : (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) \

17
include/z64save.h
View file

@ -96,11 +96,8 @@ typedef struct {
/* 0x0E64 */ FaroresWindData fw; /* 0x0E64 */ FaroresWindData fw;
/* 0x0E8C */ char unk_E8C[0x10]; /* 0x0E8C */ char unk_E8C[0x10];
/* 0x0E9C */ s32 gsFlags[6]; /* 0x0E9C */ s32 gsFlags[6];
/* 0x0EB4 */ char unk_EB4[0xC]; /* 0x0EB4 */ char unk_EB4[0x4];
/* 0x0EC0 */ s32 unk_EC0; /* 0x0EB8 */ s32 highScores[7];
/* 0x0EC4 */ s32 horseRaceRecord;
/* 0x0EC8 */ char unk_EC8[0x08];
/* 0x0ED0 */ s32 dampeRaceTime;
/* 0x0ED4 */ u16 eventChkInf[14]; // "event_chk_inf" /* 0x0ED4 */ u16 eventChkInf[14]; // "event_chk_inf"
/* 0x0EF0 */ u16 itemGetInf[4]; // "item_get_inf" /* 0x0EF0 */ u16 itemGetInf[4]; // "item_get_inf"
/* 0x0EF8 */ u16 infTable[30]; // "inf_table" /* 0x0EF8 */ u16 infTable[30]; // "inf_table"
@ -189,4 +186,14 @@ typedef enum {
/* 0xFF */ BTN_DISABLED = 0xFF /* 0xFF */ BTN_DISABLED = 0xFF
} ButtonStatus; } ButtonStatus;
typedef enum {
/* 0x00 */ HS_HBA, // horseback archery
/* 0x01 */ HS_POE_POINTS,
/* 0x02 */ HS_FISHING,
/* 0x03 */ HS_HORSE_RACE,
/* 0x04 */ HS_MARATHON,
/* 0x05 */ HS_UNK_05,
/* 0x06 */ HS_DAMPE_RACE
} HighScores;
#endif #endif

2
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -1052,7 +1052,7 @@ void DemoEc_FishingManPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx*
Gfx** gfx) { Gfx** gfx) {
DemoEc* this = THIS; DemoEc* this = THIS;
if ((limbIndex == 8) && !(gSaveContext.unk_EC0 & 0x1000)) { if ((limbIndex == 8) && !(HIGH_SCORE(HS_FISHING) & 0x1000)) {
gSPDisplayList((*gfx)++, SEGMENTED_TO_VIRTUAL(D_060074C8)); gSPDisplayList((*gfx)++, SEGMENTED_TO_VIRTUAL(D_060074C8));
} }
} }

12
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -83,13 +83,13 @@ u16 func_80AA2AA0(GlobalContext* globalCtx, Actor* thisx) {
if (gSaveContext.timer1Value >= 0xD3) { if (gSaveContext.timer1Value >= 0xD3) {
return 0x208E; return 0x208E;
} }
if ((gSaveContext.horseRaceRecord == 0) || (gSaveContext.horseRaceRecord >= 0xB4)) { if ((HIGH_SCORE(HS_HORSE_RACE) == 0) || (HIGH_SCORE(HS_HORSE_RACE) >= 0xB4)) {
gSaveContext.horseRaceRecord = 0xB4; HIGH_SCORE(HS_HORSE_RACE) = 0xB4;
gSaveContext.timer1Value = *timer1ValuePtr; gSaveContext.timer1Value = *timer1ValuePtr;
} }
if (!(gSaveContext.eventChkInf[1] & 0x4000) && (gSaveContext.timer1Value < 0x32)) { if (!(gSaveContext.eventChkInf[1] & 0x4000) && (gSaveContext.timer1Value < 0x32)) {
return 0x208F; return 0x208F;
} else if (gSaveContext.timer1Value < gSaveContext.horseRaceRecord) { } else if (gSaveContext.timer1Value < HIGH_SCORE(HS_HORSE_RACE)) {
return 0x2012; return 0x2012;
} else { } else {
return 0x2004; return 0x2004;
@ -126,7 +126,7 @@ s16 func_80AA2BD4(GlobalContext* globalCtx, Actor* thisx) {
if (globalCtx->msgCtx.choiceIndex == 0) { if (globalCtx->msgCtx.choiceIndex == 0) {
if (gSaveContext.eventChkInf[1] & 0x4000) { if (gSaveContext.eventChkInf[1] & 0x4000) {
func_8010B720(globalCtx, 0x2091); func_8010B720(globalCtx, 0x2091);
} else if (gSaveContext.horseRaceRecord == 0) { } else if (HIGH_SCORE(HS_HORSE_RACE) == 0) {
func_8010B720(globalCtx, 0x2092); func_8010B720(globalCtx, 0x2092);
} else { } else {
func_8010B720(globalCtx, 0x2090); func_8010B720(globalCtx, 0x2090);
@ -144,8 +144,8 @@ s16 func_80AA2BD4(GlobalContext* globalCtx, Actor* thisx) {
gSaveContext.eventChkInf[1] |= 0x4000; gSaveContext.eventChkInf[1] |= 0x4000;
case 0x2004: case 0x2004:
case 0x2012: case 0x2012:
if (gSaveContext.horseRaceRecord > gSaveContext.timer1Value) { if (HIGH_SCORE(HS_HORSE_RACE) > gSaveContext.timer1Value) {
gSaveContext.horseRaceRecord = gSaveContext.timer1Value; HIGH_SCORE(HS_HORSE_RACE) = gSaveContext.timer1Value;
} }
case 0x208E: case 0x208E:
gSaveContext.eventInf[0] &= ~0x400; gSaveContext.eventInf[0] &= ~0x400;

6
src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
View file

@ -316,8 +316,8 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, GlobalContext* globalCtx) {
sp60.x = this->actor.posRot.pos.x; sp60.x = this->actor.posRot.pos.x;
sp60.y = this->actor.groundY; sp60.y = this->actor.groundY;
sp60.z = this->actor.posRot.pos.z; sp60.z = this->actor.posRot.pos.z;
if (gSaveContext.timer1Value < gSaveContext.dampeRaceTime) { if (gSaveContext.timer1Value < HIGH_SCORE(HS_DAMPE_RACE)) {
gSaveContext.dampeRaceTime = gSaveContext.timer1Value; HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timer1Value;
} }
if (Flags_GetCollectible(globalCtx, this->actor.params) == 0 && gSaveContext.timer1Value <= 60) { if (Flags_GetCollectible(globalCtx, this->actor.params) == 0 && gSaveContext.timer1Value <= 60) {
Item_DropCollectible2(globalCtx, &sp60, (this->actor.params << 8) + (0x4000 | ITEM00_HEART_PIECE)); Item_DropCollectible2(globalCtx, &sp60, (this->actor.params << 8) + (0x4000 | ITEM00_HEART_PIECE));
@ -326,7 +326,7 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, GlobalContext* globalCtx) {
} }
} else { } else {
Flags_SetTempClear(globalCtx, 4); Flags_SetTempClear(globalCtx, 4);
gSaveContext.dampeRaceTime = gSaveContext.timer1Value; HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timer1Value;
} }
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }