mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +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

12
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View file

@ -241,11 +241,11 @@ void EnGe2_CaptureClose(EnGe2* this, GlobalContext* globalCtx) {
func_8006D074(globalCtx);
if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) {
globalCtx->nextEntranceIndex = 0x1A5;
globalCtx->nextEntranceIndex = ENTR_SPOT09_1;
} else if (GET_EVENTCHKINF(EVENTCHKINF_C7)) {
globalCtx->nextEntranceIndex = 0x5F8;
globalCtx->nextEntranceIndex = ENTR_SPOT12_18;
} else {
globalCtx->nextEntranceIndex = 0x3B4;
globalCtx->nextEntranceIndex = ENTR_SPOT12_17;
}
globalCtx->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
@ -267,11 +267,11 @@ void EnGe2_CaptureCharge(EnGe2* this, GlobalContext* globalCtx) {
func_8006D074(globalCtx);
if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) {
globalCtx->nextEntranceIndex = 0x1A5;
globalCtx->nextEntranceIndex = ENTR_SPOT09_1;
} else if (GET_EVENTCHKINF(EVENTCHKINF_C7)) {
globalCtx->nextEntranceIndex = 0x5F8;
globalCtx->nextEntranceIndex = ENTR_SPOT12_18;
} else {
globalCtx->nextEntranceIndex = 0x3B4;
globalCtx->nextEntranceIndex = ENTR_SPOT12_17;
}
globalCtx->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);