mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +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

14
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View file

@ -541,7 +541,7 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) {
switch (this->unk_150[i].unk_22) {
case 0:
func_80989B54(thisx, globalCtx, i);
if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map
if (gSaveContext.entranceIndex == ENTR_HIRAL_DEMO_0) {
this->unk_150[i].unk_0.y = Rand_ZeroOne() * 500.0f;
} else {
this->unk_150[i].unk_0.y = Rand_ZeroOne() * -500.0f;
@ -550,16 +550,16 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) {
break;
case 1:
temp_f12_2 = globalCtx->view.eye.y + (dy / norm) * 150.0f;
if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map
if (gSaveContext.entranceIndex == ENTR_HIRAL_DEMO_0) {
this->unk_150[i].unk_0.y -= this->unk_150[i].unk_18;
} else {
this->unk_150[i].unk_0.y += this->unk_150[i].unk_18;
}
if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map
if (gSaveContext.entranceIndex == ENTR_HIRAL_DEMO_0) {
if (this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y < temp_f12_2 - 300.0f) {
this->unk_150[i].unk_22++;
}
} else if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field
} else if (gSaveContext.entranceIndex == ENTR_SPOT00_0) {
if (temp_f12_2 + 300.0f < this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y) {
this->unk_150[i].unk_22++;
}
@ -578,12 +578,14 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x,
this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y,
this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z, MTXMODE_NEW);
if (gSaveContext.entranceIndex != 0x00A0) { // Cutscene Map
if (gSaveContext.entranceIndex != ENTR_HIRAL_DEMO_0) {
Matrix_RotateX(M_PI, MTXMODE_APPLY);
}
gDPPipeSync(POLY_XLU_DISP++);
if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field
if (gSaveContext.entranceIndex == ENTR_SPOT00_0) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 255);
} else {