MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-30 16:29:55 +00:00
Code Releases Wiki Activity

Added cheat to make the guards in Gerudo's fortress blind. (#181)

Browse Source 
Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
This commit is contained in:
DaMarkov 2022-02-22 05:03:27 +01:00 committed by GitHub
parent cfb7c151e3
commit fd368f425c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GLideN64

@ -1 +1 @@
Subproject commit b595b9646cb4e160b717ec4663e98b553f28b903
Subproject commit 403658b456e0f4792c62d7fc8ba5fa273a7811a3

7
src/overlays/actors/ovl_En_Ge2/z_en_ge2.cpp
View File

@ -20,6 +20,7 @@
#include "def/z_message_PAL.h"
#include "def/z_rcp.h"
#include "def/z_skelanime.h"
#include "../../../port/options.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)
@ -576,13 +577,15 @@ void EnGe2_Update(Actor* thisx, GlobalContext* globalCtx) {
pthis->yDetectRange)) {
// "Discovered!"
osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
EnGe2_SetupCapturePlayer(pthis, globalCtx);
if (!oot::config().cheats().blindGerudoGuards())
EnGe2_SetupCapturePlayer(pthis, globalCtx);
}
if (((pthis->actor.params & 0xFF) == GE2_TYPE_STATIONARY) && (pthis->actor.xzDistToPlayer < 100.0f)) {
// "Discovered!"
osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
EnGe2_SetupCapturePlayer(pthis, globalCtx);
if (!oot::config().cheats().blindGerudoGuards())
EnGe2_SetupCapturePlayer(pthis, globalCtx);
}
}

8
src/port/options.h
View File

@ -125,6 +125,11 @@ namespace oot
{
return m_speed;
}
bool& blindGerudoGuards()
{
return m_blindGerudoGuards;
}
protected:
bool m_invincible;
@ -132,8 +137,9 @@ namespace oot
u8 padding[2];
float m_bowserAimAssist;
float m_speed;
bool m_blindGerudoGuards;
u8 junk[0x40 - (2 + 7 + 4)];
u8 junk[0x40 - (2 + 7 + 4 + 1)];
};
static_assert(sizeof(Cheats) == 0x40, "Cheats size incorrect");