Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rachael -> zhora #1104

Merged
merged 6 commits into from
Aug 9, 2022
Merged

rachael -> zhora #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
facd172
don't use signed ints for epochs (#1044)
briaguya-ai Aug 4, 2022
d397c1d
Increment version
Kenix3 Aug 4, 2022
4bf4ad3
Update z_en_ru1.c (#1042)
InfoManiac742 Aug 8, 2022
0e10b59
Update z_kaleido_item.c (#1046)
InfoManiac742 Aug 8, 2022
4ea7f83
Rando: Zelda sequence fixes (#1095)
aMannus Aug 8, 2022
317de33
Merge branch 'develop-rachael' into rachael-to-zhora
Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions soh/include/z64effect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef struct {
/* 0x0C */ Vec3f position;
/* 0x18 */ Vec3s unkVelocity;
/* 0x1E */ Vec3s unkPosition;
/* 0x24 */ s32 epoch;
/* 0x24 */ u32 epoch;
} EffectSparkElement; // size = 0x28

typedef struct {
Expand Down Expand Up @@ -118,7 +118,7 @@ typedef struct {
/* 0x10 */ f32 startX;
/* 0x14 */ s16 yaw;
/* 0x16 */ s16 pitch;
/* 0x18 */ s32 epoch;
/* 0x18 */ u32 epoch;
} EffectShieldParticleElement; // size = 0x1C

typedef struct {
Expand Down
5 changes: 4 additions & 1 deletion soh/soh/Enhancements/randomizer/randomizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3226,7 +3226,10 @@ void GenerateRandomizerImgui() {
cvarSettings[RSK_CUCCO_COUNT] = CVar_GetS32("gRandomizeCuccosToReturn", 7);
cvarSettings[RSK_BIG_POE_COUNT] = CVar_GetS32("gRandomizeBigPoeTargetCount", 10);

cvarSettings[RSK_SKIP_CHILD_STEALTH] = CVar_GetS32("gRandomizeSkipChildStealth", 0);
// If we skip child zelda, skip child stealth is pointless, so this needs to be reflected in the spoiler log
cvarSettings[RSK_SKIP_CHILD_STEALTH] =
!CVar_GetS32("gRandomizeSkipChildZelda", 0) && CVar_GetS32("gRandomizeSkipChildStealth", 0);

cvarSettings[RSK_SKIP_EPONA_RACE] = CVar_GetS32("gRandomizeSkipEponaRace", 0);
cvarSettings[RSK_SKIP_TOWER_ESCAPE] = CVar_GetS32("gRandomizeSkipTowerEscape", 0);

Expand Down
2 changes: 1 addition & 1 deletion soh/src/code/z_actor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3957,7 +3957,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) {
f32 chainsTranslateX;
f32 chainsTranslateY;
f32 rotZStep;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

entry = &sDoorLocksInfo[type];
Expand Down
6 changes: 3 additions & 3 deletions soh/src/code/z_kankyo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
LENS_FLARE_RING, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1,
LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1,
};
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(gfxCtx);
Expand Down Expand Up @@ -1642,7 +1642,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext*
Vec3f unused = { 0.0f, 0.0f, 0.0f };
Vec3f windDirection = { 0.0f, 0.0f, 0.0f };
Player* player = GET_PLAYER(globalCtx);
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100) && (globalCtx->envCtx.unk_EE[2] == 0)) {
Expand Down Expand Up @@ -1925,7 +1925,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) {
s32 pad[2];
Vec3f unused1 = { 0.0f, 0.0f, 0.0f };
Vec3f unused2 = { 0.0f, 0.0f, 0.0f };
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/code/z_lifemeter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
s32 curCombineModeSet = 0;
u8* curBgImgLoaded = NULL;
s32 ddHeartCountMinusOne = gSaveContext.inventory.defenseHearts - 1;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(gfxCtx);
Expand Down
10 changes: 7 additions & 3 deletions soh/src/code/z_play.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,15 @@ void Gameplay_Init(GameState* thisx) {
u8 tempSetupIndex;
s32 pad[2];

if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH)) {
// Skip Child Stealth when option is enabled, Zelda's Letter isn't obtained and Impa's reward hasn't been received
// eventChkInf[4] & 1 = Got Zelda's Letter
// eventChkInf[5] & 0x200 = Got Impa's reward
// entranceIndex 0x7A, Castle Courtyard - Day from crawlspace
// entranceIndex 0x400, Zelda's Courtyard
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH) &&
!(gSaveContext.eventChkInf[4] & 1) && !(gSaveContext.eventChkInf[5] & 0x200)) {
if (gSaveContext.entranceIndex == 0x7A) {
gSaveContext.entranceIndex = 0x400;
} else if (gSaveContext.entranceIndex == 0x296) {
gSaveContext.entranceIndex = 0x23D;
}
}

Expand Down
6 changes: 3 additions & 3 deletions soh/src/code/z_sram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,12 +793,12 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
gSaveContext.eventChkInf[1] |= (1 << 3);
gSaveContext.eventChkInf[1] |= (1 << 4);

// Set "Got Zelda's Letter" flag. Also ensures Saria is back at SFM. TODO: Is this flag used for anything else?
gSaveContext.eventChkInf[4] |= 1;

// Got item from impa
gSaveContext.eventChkInf[5] |= 0x200;

// make sure saria is at SFM
gSaveContext.eventChkInf[4] |= (1 << 0);

// set this at the end to ensure we always start with the letter
// this is for the off chance we got the weird egg from impa (which should never happen)
INV_CONTENT(ITEM_LETTER_ZELDA) = ITEM_LETTER_ZELDA;
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ typedef struct {
/* 0x36 */ f32 pitch;
/* 0x36 */ f32 yaw;
/* 0x40 */ f32 roll;
/* 0x44 */ s32 epoch;
/* 0x44 */ u32 epoch;
} BgDyYoseizoParticle; // size = 0x48

typedef struct BgDyYoseizo {
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ typedef struct {
/* 0x0C */ Vec3f vel;
/* 0x18 */ s16 rotVelX;
/* 0x1A */ s16 rotVelY;
/* 0x1C */ s32 epoch;
/* 0x1C */ u32 epoch;
} BgJyaMegamiPiece; // size = 0x20

typedef struct BgJyaMegami {
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
f32 angle;
s32 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ typedef struct {
/* 0x26 */ Color_RGB8 color;
/* 0x2A */ s16 alpha;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ s32 epoch;
/* 0x30 */ u32 epoch;
} BossDodongoEffect; // Size = 0x34

typedef struct BossDodongo {
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,7 +1835,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) {
s16 i;
f32 temp_float;
Mtx* tempMat = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Mtx));
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ typedef struct BossFd2 {
/* 0x1394 */ BossFd2Cam camData;
/* 0x141C */ ColliderJntSph collider;
/* 0x143C */ ColliderJntSphElement elements[9];
/* 0x167C */ s32 epoch;
/* 0x167C */ u32 epoch;
} BossFd2; // size = 0x1680

#endif
6 changes: 3 additions & 3 deletions soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3356,7 +3356,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) {
s32 pad;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s16 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(gfxCtx);
Expand Down Expand Up @@ -3463,7 +3463,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) {
f32 yRot;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s16 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(gfxCtx);
Expand Down Expand Up @@ -4158,7 +4158,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) {
s16 i;
f32 alpha;
s32 pad;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
8 changes: 4 additions & 4 deletions soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,7 +2464,7 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) {
f32 angle;
f32 sin;
f32 cos;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -2637,7 +2637,7 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) {
s32 pad;
s16 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -2701,7 +2701,7 @@ void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) {
void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) {
Player* player;
f32 phi_f20;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -2933,7 +2933,7 @@ void func_809060E8(GlobalContext* globalCtx) {
BossGanon2Effect* effect;
s16 i;
BossGanon2Effect* effects;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

effects = effect = globalCtx->specialEffects;
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2443,7 +2443,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) {
f32 phi_f20;
f32 phi_f22;
Vec3f sp110;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,7 +2706,7 @@ s32 BossSst_OverrideHandTrailDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**

void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) {
BossSst* this = (BossSst*)thisx;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ typedef struct {
/* 0x0020 */ s16 move;
/* 0x0022 */ s16 status;
/* 0x0024 */ u8 alpha;
/* 0x0028 */ s32 epoch;
/* 0x0028 */ u32 epoch;
} BossSstEffect; // size = 0x2C

typedef struct {
Expand Down
6 changes: 3 additions & 3 deletions soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3329,7 +3329,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) {
void func_809426F0(BossTw* this, GlobalContext* globalCtx) {
s32 pad;
s16 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -4418,7 +4418,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) {
f32 scaleFactor;
s16 tailIdx;
s16 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -4492,7 +4492,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) {
f32 scaleFactor;
s16 tailIdx;
s16 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ typedef struct {
/* 0x002E */ s16 work[EFF_WORK_MAX];
/* 0x0034 */ f32 workf[EFF_FWORK_MAX];
/* 0x0044 */ Actor* target;
s32 epoch;
u32 epoch;
} BossTwEffect;

typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4006,7 +4006,7 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) {
f32 yScale;
f32 segAngle = 0.0f;
s32 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
4 changes: 2 additions & 2 deletions soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) {
Demo6K* this = (Demo6K*)thisx;
s32 pad;
u16 timer1 = this->timer1;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -695,7 +695,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
u32 frames = globalCtx->state.frames;
s32 i;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

if ((i = (globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[1] != NULL)) &&
Expand Down
8 changes: 4 additions & 4 deletions soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) {
f32 translateY;
f32 translateZ;
s16 j;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -663,7 +663,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) {
f32 dx;
f32 dy;
f32 dz;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -784,7 +784,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) {
f32 translateZ;
PosRot posRot;
u8 linkAge = gSaveContext.linkAge;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down Expand Up @@ -933,7 +933,7 @@ void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) {
f32 scale;
s16 i;
PosRot posRot;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(globalCtx->state.gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ typedef struct {
/* 0x30 */ char unk_2C[4];
/* 0x34 */ f32 scale;
/* 0x38 */ char unk_34[8];
/* 0x3C */ s32 epoch;
/* 0x3C */ u32 epoch;
} EfcErupcParticles; // size 0x40

#define EFC_ERUPC_NUM_PARTICLES 100
Expand Down
4 changes: 2 additions & 2 deletions soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
f32* distanceTraveled;
s32 i;
f32 aux;
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(gfxCtx);
Expand Down Expand Up @@ -321,7 +321,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
s32 i;
f32 aux;
Player* player = GET_PLAYER(globalCtx);
static s32 epoch = 0;
static u32 epoch = 0;
epoch++;

OPEN_DISPS(gfxCtx);
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ typedef struct EnAnubiceFire {
/* 0x015E */ s16 unk_15E;
/* 0x0178 */ Vec3f unk_160[6];
/* 0x01A8 */ ColliderCylinder cylinder;
/* 0x01F4 */ s32 epoch;
/* 0x01F4 */ u32 epoch;
} EnAnubiceFire; // size = 0x01F8

#endif
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_En_Ba/z_en_ba.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typedef struct EnBa {
/* 0x031C */ s16 unk31C;
/* 0x0320 */ ColliderJntSph collider;
/* 0x0340 */ ColliderJntSphElement colliderItems[2];
/* 0x03C0 */ s32 epoch;
/* 0x03C0 */ u32 epoch;
} EnBa; // size = 0x03C4

#endif
Loading