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

75
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -3324,48 +3324,57 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
Gameplay_SaveSceneFlags(globalCtx);
switch (gSaveContext.entranceIndex) {
case 0x0000:
case 0x0004:
case 0x0028:
case 0x0169:
case 0x0165:
case 0x0010:
case 0x0082:
case 0x0037:
case 0x041B:
case 0x0008:
case 0x0088:
case 0x0486:
case 0x0098:
case 0x0467:
case 0x0179:
case ENTR_YDAN_0:
case ENTR_DDAN_0:
case ENTR_BDAN_0:
case ENTR_BMORI1_0:
case ENTR_HIDAN_0:
case ENTR_MIZUSIN_0:
case ENTR_JYASINZOU_0:
case ENTR_HAKADAN_0:
case ENTR_GANON_0:
case ENTR_MEN_0:
case ENTR_ICE_DOUKUTO_0:
case ENTR_GERUDOWAY_0:
case ENTR_HAKADANCH_0:
case ENTR_GANONTIKA_0:
case ENTR_GANON_SONOGO_0:
break;
case 0x040F:
gSaveContext.entranceIndex = 0x0000;
case ENTR_YDAN_BOSS_0:
gSaveContext.entranceIndex = ENTR_YDAN_0;
break;
case 0x040B:
gSaveContext.entranceIndex = 0x0004;
case ENTR_DDAN_BOSS_0:
gSaveContext.entranceIndex = ENTR_DDAN_0;
break;
case 0x0301:
gSaveContext.entranceIndex = 0x0028;
case ENTR_BDAN_BOSS_0:
gSaveContext.entranceIndex = ENTR_BDAN_0;
break;
case 0x000C:
gSaveContext.entranceIndex = 0x0169;
case ENTR_MORIBOSSROOM_0:
gSaveContext.entranceIndex = ENTR_BMORI1_0;
break;
case 0x0305:
gSaveContext.entranceIndex = 0x0165;
case ENTR_FIRE_BS_0:
gSaveContext.entranceIndex = ENTR_HIDAN_0;
break;
case 0x0417:
gSaveContext.entranceIndex = 0x0010;
case ENTR_MIZUSIN_BS_0:
gSaveContext.entranceIndex = ENTR_MIZUSIN_0;
break;
case 0x008D:
gSaveContext.entranceIndex = 0x0082;
case ENTR_JYASINBOSS_0:
gSaveContext.entranceIndex = ENTR_JYASINZOU_0;
break;
case 0x0413:
gSaveContext.entranceIndex = 0x0037;
case ENTR_HAKADAN_BS_0:
gSaveContext.entranceIndex = ENTR_HAKADAN_0;
break;
case 0x041F:
gSaveContext.entranceIndex = 0x041B;
case ENTR_GANON_BOSS_0:
gSaveContext.entranceIndex = ENTR_GANON_0;
break;
}
} else {