mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 14:31:17 +00:00
Name scenes (scene enum, entrance enum, various identifiers) (#1343)
* Comment names on titled scenes
* Comment some more scene names
* Comment some map assets symbol prefixes
* Name collapse sequence scenes (from the non-collapse equivalent scene's name + `_COLLAPSE`)
* Name ganon/ganondorf boss scenes (symbol prefix suffixed with `Scene` to prevent confusion with boss actors)
* Fix symbol prefix for back alley night scene
* Name the two grave scenes (normal and fairy's fountain variant)
* Name most houses, name/update misc scenes
Co-authored-by: fig02 <fig02srl@gmail.com>
* (hakaana) `GRAVE` -> `REDEAD_GRAVE` to be more specific
Co-authored-by: fig02 <fig02srl@gmail.com>
* `miharigoya_scene`: `market_guard_house`
* `kakariko_scene` -> `kakariko_center_house`
* `richards_house` -> `dog_lady_house` (for localization differences)
* Revert "Comment some map assets symbol prefixes"
This reverts commit 210a38a628.
* remove other xml prefixes
* ganon_boss, ganondorf_boss
* comments to namefixer
* `KAKARIKO_CENTER_HOUSE` -> `KAKARIKO_CENTER_GUEST_HOUSE`
* two collapse sequence scenes -> `GANONS_TOWER_COLLAPSE_`interior/exterior
* Run namefixer
`find src include -type f -exec ./tools/namefixer.py {} \;`
* run formatter
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
Dragorn421
GitHub
parent
eb0a82c513
commit
186ecc72b5
96 changed files with 3577 additions and 3274 deletions
|
|
@ -194,16 +194,16 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) {
|
|||
case DEMOKANKYO_BLUE_RAIN:
|
||||
case DEMOKANKYO_BLUE_RAIN_2:
|
||||
switch (play->sceneId) {
|
||||
case SCENE_HIRAL_DEMO:
|
||||
case SCENE_CUTSCENE_MAP:
|
||||
play->roomCtx.curRoom.segment = NULL;
|
||||
D_8098CF80 = 10;
|
||||
sRainScale = 8;
|
||||
break;
|
||||
case SCENE_TOKINOMA:
|
||||
case SCENE_TEMPLE_OF_TIME:
|
||||
D_8098CF80 = 14;
|
||||
sRainScale = 8;
|
||||
break;
|
||||
case SCENE_SPOT00:
|
||||
case SCENE_HYRULE_FIELD:
|
||||
D_8098CF80 = 1;
|
||||
sRainScale = 5;
|
||||
break;
|
||||
|
|
@ -318,7 +318,7 @@ void DemoKankyo_SetupType(DemoKankyo* this, PlayState* play) {
|
|||
this->warpTimer--;
|
||||
}
|
||||
if (this->warpTimer == 1) {
|
||||
if (play->sceneId == SCENE_TOKINOMA) {
|
||||
if (play->sceneId == SCENE_TEMPLE_OF_TIME) {
|
||||
D_8098CF84 = 25;
|
||||
if (!LINK_IS_ADULT) {
|
||||
play->csCtx.segment = gChildWarpInToTCS;
|
||||
|
|
@ -340,7 +340,7 @@ void DemoKankyo_SetupType(DemoKankyo* this, PlayState* play) {
|
|||
}
|
||||
break;
|
||||
case DEMOKANKYO_WARP_IN:
|
||||
if (play->sceneId == SCENE_TOKINOMA) {
|
||||
if (play->sceneId == SCENE_TEMPLE_OF_TIME) {
|
||||
if (!LINK_IS_ADULT) {
|
||||
play->csCtx.segment = gChildWarpOutToTCS;
|
||||
} else {
|
||||
|
|
@ -432,7 +432,7 @@ void DemoKankyo_Draw(Actor* thisx, PlayState* play) {
|
|||
switch (this->actor.params) {
|
||||
case DEMOKANKYO_BLUE_RAIN:
|
||||
case DEMOKANKYO_BLUE_RAIN_2:
|
||||
if (play->sceneId == SCENE_TOKINOMA) {
|
||||
if (play->sceneId == SCENE_TEMPLE_OF_TIME) {
|
||||
if (!Flags_GetEnv(play, 1)) {
|
||||
break;
|
||||
} else if (!Actor_IsFacingAndNearPlayer(&this->actor, 300.0f, 0x7530)) {
|
||||
|
|
@ -486,12 +486,12 @@ void func_80989B54(Actor* thisx, PlayState* play, s16 i) {
|
|||
DemoKankyo* this = (DemoKankyo*)thisx;
|
||||
|
||||
switch (play->sceneId) {
|
||||
case SCENE_HIRAL_DEMO:
|
||||
case SCENE_CUTSCENE_MAP:
|
||||
this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 500.0f;
|
||||
this->unk_150[i].unk_0.y = 500.0f;
|
||||
this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 500.0f;
|
||||
break;
|
||||
case SCENE_TOKINOMA:
|
||||
case SCENE_TEMPLE_OF_TIME:
|
||||
this->unk_150[i].unk_C.x = 0.0f;
|
||||
this->unk_150[i].unk_C.y = 0.0f;
|
||||
this->unk_150[i].unk_C.z = 0.0f;
|
||||
|
|
@ -499,7 +499,7 @@ void func_80989B54(Actor* thisx, PlayState* play, s16 i) {
|
|||
this->unk_150[i].unk_0.y = 10.0f;
|
||||
this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 180.0f;
|
||||
break;
|
||||
case SCENE_SPOT00:
|
||||
case SCENE_HYRULE_FIELD:
|
||||
this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 600.0f;
|
||||
this->unk_150[i].unk_0.y = -500.0f;
|
||||
this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 600.0f;
|
||||
|
|
@ -531,7 +531,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
|
|||
dz = play->view.at.z - play->view.eye.z;
|
||||
norm = sqrtf(SQ(dx) + SQ(dy) + SQ(dz));
|
||||
|
||||
if (play->sceneId != SCENE_TOKINOMA) {
|
||||
if (play->sceneId != SCENE_TEMPLE_OF_TIME) {
|
||||
this->unk_150[i].unk_C.x = play->view.eye.x + (dx / norm) * 350.0f;
|
||||
this->unk_150[i].unk_C.y = play->view.eye.y + (dy / norm) * 80.0f;
|
||||
this->unk_150[i].unk_C.z = play->view.eye.z + (dz / norm) * 350.0f;
|
||||
|
|
@ -540,7 +540,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
|
|||
switch (this->unk_150[i].unk_22) {
|
||||
case 0:
|
||||
func_80989B54(thisx, play, i);
|
||||
if (gSaveContext.entranceIndex == ENTR_HIRAL_DEMO_0) {
|
||||
if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) {
|
||||
this->unk_150[i].unk_0.y = Rand_ZeroOne() * 500.0f;
|
||||
} else {
|
||||
this->unk_150[i].unk_0.y = Rand_ZeroOne() * -500.0f;
|
||||
|
|
@ -549,16 +549,16 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
|
|||
break;
|
||||
case 1:
|
||||
temp_f12_2 = play->view.eye.y + (dy / norm) * 150.0f;
|
||||
if (gSaveContext.entranceIndex == ENTR_HIRAL_DEMO_0) {
|
||||
if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_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 == ENTR_HIRAL_DEMO_0) {
|
||||
if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_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 == ENTR_SPOT00_0) {
|
||||
} else if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_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,13 +578,13 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
|
|||
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 != ENTR_HIRAL_DEMO_0) {
|
||||
if (gSaveContext.entranceIndex != ENTR_CUTSCENE_MAP_0) {
|
||||
Matrix_RotateX(M_PI, MTXMODE_APPLY);
|
||||
}
|
||||
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
|
||||
if (gSaveContext.entranceIndex == ENTR_SPOT00_0) {
|
||||
if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0) {
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 255);
|
||||
} else {
|
||||
|
|
@ -597,7 +597,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
|
|||
for (j = 0; j < 5; j++) {
|
||||
s32 pad1;
|
||||
|
||||
if (play->sceneId != SCENE_TOKINOMA) {
|
||||
if (play->sceneId != SCENE_TEMPLE_OF_TIME) {
|
||||
if (this->unk_150[i].unk_0.x >= 0.0f) {
|
||||
translateX = -j * 1500.0f;
|
||||
} else {
|
||||
|
|
@ -799,7 +799,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
|
|||
&this->unk_150[i].unk_1C) != 0) {
|
||||
this->unk_150[i].unk_22++;
|
||||
}
|
||||
if (play->sceneId == SCENE_TOKINOMA && play->csCtx.frames == 25) {
|
||||
if (play->sceneId == SCENE_TEMPLE_OF_TIME && play->csCtx.frames == 25) {
|
||||
this->unk_150[i].unk_22++;
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue