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

4
src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View file

@ -378,7 +378,7 @@ void EnZl4_Init(Actor* thisx, GlobalContext* globalCtx) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
this->actionFunc = EnZl4_Idle;
} else {
if (gSaveContext.entranceIndex != 0x5F0) {
if (gSaveContext.entranceIndex != ENTR_NAKANIWA_1) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_21);
this->csState = ZL4_CS_WAIT;
this->talkState = 0;
@ -770,7 +770,7 @@ s32 EnZl4_CsAskName(EnZl4* this, GlobalContext* globalCtx) {
this->talkTimer2++;
if (this->talkTimer2 == 130) {
globalCtx->msgCtx.msgMode = MSGMODE_PAUSED;
globalCtx->nextEntranceIndex = 0xA0;
globalCtx->nextEntranceIndex = ENTR_HIRAL_DEMO_0;
gSaveContext.nextCutsceneIndex = 0xFFF7;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE;