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

Cleanup post good scene names (#1452)

Browse source 
* Cleanup scene names

* missing scene id use

* rename scene draw config functions

* remove now useless comments

* format

* fix double defense/magic swapped

* try precision on "from potion shop"

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
This commit is contained in:
Dragorn421 2022-12-05 19:37:40 +01:00 • committed by GitHub
parent 8ff58118b3
commit 9bad1d108e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 227 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
View file

@ -387,7 +387,7 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) {
break;
}
} else if (type == ENVIEWER_TYPE_2_ZELDA) {
if (play->sceneId == SCENE_HYRULE_FIELD) { // Hyrule Field
if (play->sceneId == SCENE_HYRULE_FIELD) {
switch (this->state) {
case 0:
if (play->csCtx.state != CS_STATE_IDLE) {
@ -587,7 +587,7 @@ void EnViewer_DrawHorse(EnViewer* this, PlayState* play) {
}
s32 EnViewer_ZeldaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
if (play->sceneId == SCENE_HYRULE_FIELD) { // Hyrule Field
if (play->sceneId == SCENE_HYRULE_FIELD) {
if (limbIndex == 2) {
*dList = gChildZeldaCutsceneDressDL;
}
@ -624,7 +624,7 @@ void EnViewer_ZeldaPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
void EnViewer_DrawZelda(EnViewer* this, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_en_viewer.c", 1583);
if (play->sceneId == SCENE_HYRULE_FIELD) { // Hyrule Field
if (play->sceneId == SCENE_HYRULE_FIELD) {
if (play->csCtx.frames < 771) {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gChildZeldaEyeInTex));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gChildZeldaEyeOutTex));