mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

Name scenes (scene enum, entrance enum, various identifiers) (#1343)

Browse source 
* 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 2022-11-26 22:15:41 +01:00 • committed by GitHub
parent eb0a82c513
commit 186ecc72b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 3577 additions and 3274 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
View file

@ -38,7 +38,7 @@ ActorInit En_Encount2_InitVars = {
void EnEncount2_Init(Actor* thisx, PlayState* play) {
EnEncount2* this = (EnEncount2*)thisx;
if (play->sceneId != SCENE_SPOT16) {
if (play->sceneId != SCENE_DEATH_MOUNTAIN_TRAIL) {
this->isNotDeathMountain = true;
}
@ -76,8 +76,8 @@ void EnEncount2_Wait(EnEncount2* this, PlayState* play) {
} else if ((this->actor.xzDistToPlayer < 700.0f) && (Flags_GetSwitch(play, 0x37))) {
s16 sceneId = play->sceneId;
if (((sceneId == SCENE_GANON_DEMO) || (sceneId == SCENE_GANON_FINAL) || (sceneId == SCENE_GANON_SONOGO) ||
(sceneId == SCENE_GANONTIKA_SONOGO)) &&
if (((sceneId == SCENE_GANON_BOSS) || (sceneId == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
(sceneId == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (sceneId == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) &&
(!this->collapseSpawnerInactive)) {
spawnerState = ENCOUNT2_ACTIVE_GANONS_TOWER;
}
@ -156,8 +156,8 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) {
} else if ((this->actor.xzDistToPlayer < 700.0f) && (Flags_GetSwitch(play, 0x37) != 0)) {
s16 sceneId = play->sceneId;
if (((sceneId == SCENE_GANON_DEMO) || (sceneId == SCENE_GANON_FINAL) || (sceneId == SCENE_GANON_SONOGO) ||
(sceneId == SCENE_GANONTIKA_SONOGO)) &&
if (((sceneId == SCENE_GANON_BOSS) || (sceneId == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
(sceneId == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (sceneId == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) &&
(!this->collapseSpawnerInactive)) {
maxRocks = 1;
spawnerState = ENCOUNT2_ACTIVE_GANONS_TOWER;
@ -326,7 +326,7 @@ void EnEncount2_UpdateEffects(EnEncount2* this, PlayState* play) {
Math_ApproachF(&effect->pos.z, targetPos.z, 0.3f, 30.0f);
Math_ApproachF(&effect->moveDirection.y, -20.0f, 0.9f, 1.0f);
if (play->sceneId != SCENE_SPOT16) {
if (play->sceneId != SCENE_DEATH_MOUNTAIN_TRAIL) {
if (effect->pos.y < (player->actor.floorHeight - 50.0f)) {
effect->isAlive = 0;
}