mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Introduce DEFINE_ENTRANCE for entrance table and create entrance enum (#1213)

Browse source 
* entrance table OK

* entrance enum fixed

* most entrances using enum, still need to do conditionals

* more entrances

* entrance_table.h cleanups

* some review

* remove _0 from first entrance in a group of setups

* change table description

* typo

* wens spellcheck in vscode

* remove extra line
This commit is contained in:
fig02 2022-05-09 13:45:53 -04:00 • committed by GitHub
parent 95b4317931
commit 2efd00863a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 2478 additions and 2231 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
View file

@ -134,22 +134,22 @@ void ObjectKankyo_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (gSaveContext.cutsceneTrigger != 0) {
if (gSaveContext.entranceIndex == 0x0538) {
if (gSaveContext.entranceIndex == ENTR_GANONTIKA_2) {
this->effects[0].size = 0.1f;
}
if (gSaveContext.entranceIndex == 0x053C) {
if (gSaveContext.entranceIndex == ENTR_GANONTIKA_3) {
this->effects[1].size = 0.1f;
}
if (gSaveContext.entranceIndex == 0x0540) {
if (gSaveContext.entranceIndex == ENTR_GANONTIKA_4) {
this->effects[2].size = 0.1f;
}
if (gSaveContext.entranceIndex == 0x0544) {
if (gSaveContext.entranceIndex == ENTR_GANONTIKA_5) {
this->effects[3].size = 0.1f;
}
if (gSaveContext.entranceIndex == 0x0548) {
if (gSaveContext.entranceIndex == ENTR_GANONTIKA_6) {
this->effects[4].size = 0.1f;
}
if (gSaveContext.entranceIndex == 0x054C) {
if (gSaveContext.entranceIndex == ENTR_GANONTIKA_7) {
this->effects[5].size = 0.1f;
}
}
@ -222,8 +222,8 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, GlobalContext* globalCtx) {
}
}
if (globalCtx->envCtx.unk_EE[3] < 64 &&
(gSaveContext.entranceIndex != 0x00EE || gSaveContext.sceneSetupIndex != 4 || globalCtx->envCtx.unk_EE[3])) {
if (globalCtx->envCtx.unk_EE[3] < 64 && (gSaveContext.entranceIndex != ENTR_SPOT04_0 ||
gSaveContext.sceneSetupIndex != 4 || globalCtx->envCtx.unk_EE[3])) {
globalCtx->envCtx.unk_EE[3] += 16;
}