mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 03:44:34 +00:00
Code Issues Projects Releases Wiki Activity

Doc pass on scene & room headers (#1240)

Browse source 
* Doc pass on scene & room headers

* Remove comments on room draw handlers

* `struct ActorEntry` -> `ActorEntry`
This commit is contained in:
Dragorn421 2022-06-09 12:02:18 -07:00 • committed by GitHub
parent 3ff19c253e
commit 73ba138f54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 296 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/code/z_play.c
View file

@ -1197,7 +1197,7 @@ void Play_Draw(PlayState* this) {
POLY_OPA_DISP = sp84;
goto Play_Draw_DrawOverlayElements;
} else {
s32 sp80;
s32 roomDrawFlags;
if ((HREG(80) != 10) || (HREG(83) != 0)) {
if (this->skyboxId && (this->skyboxId != SKYBOX_UNSET_1D) && !this->envCtx.skyboxDisabled) {
@ -1236,13 +1236,13 @@ void Play_Draw(PlayState* this) {
if ((HREG(80) != 10) || (HREG(84) != 0)) {
if (VREG(94) == 0) {
if (HREG(80) != 10) {
sp80 = 3;
roomDrawFlags = ROOM_DRAW_OPA | ROOM_DRAW_XLU;
} else {
sp80 = HREG(84);
roomDrawFlags = HREG(84);
}
Scene_Draw(this);
Room_Draw(this, &this->roomCtx.curRoom, sp80 & 3);
Room_Draw(this, &this->roomCtx.prevRoom, sp80 & 3);
Room_Draw(this, &this->roomCtx.curRoom, roomDrawFlags & (ROOM_DRAW_OPA | ROOM_DRAW_XLU));
Room_Draw(this, &this->roomCtx.prevRoom, roomDrawFlags & (ROOM_DRAW_OPA | ROOM_DRAW_XLU));
}
}
@ -1808,8 +1808,8 @@ void Play_TriggerRespawn(PlayState* this) {
}
s32 func_800C0CB8(PlayState* this) {
return (this->roomCtx.curRoom.meshHeader->base.type != 1) && (YREG(15) != 0x20) && (YREG(15) != 0x30) &&
(YREG(15) != 0x40) && (this->sceneNum != SCENE_HAIRAL_NIWA);
return (this->roomCtx.curRoom.meshHeader->base.type != MESH_HEADER_TYPE_1) && (YREG(15) != 0x20) &&
(YREG(15) != 0x30) && (YREG(15) != 0x40) && (this->sceneNum != SCENE_HAIRAL_NIWA);
}
s32 FrameAdvance_IsEnabled(PlayState* this) {