diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-07-05 18:14:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 21:14:27 -0400 |
| commit | 6db3fc7b323e8d81ba848a2baa372b3295a1d29e (patch) | |
| tree | dc04ab357e99fc3df634d81005932dd8374e71a8 /src/code/z_room.c | |
| parent | 0e51bf35a169f3f73c7fb7e9f31f6ccafb4ebb25 (diff) | |
Document most of global context (#198)
* doesn't build for some reason..?
* some formatting fixes
* windows calculator is trash
* fix!
* fix2
* most of global context documented
* interfacectx
* hopefully fix interface
* document restrictions
* envCtx done
* revert accidental change
* fix
* pause ctx done
* fixxxxxxxxxxxxxxx
* remove unintended zapd change
* fix..?
* format files
* Update include/z64.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* ocarinstaff
* Update include/z64.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Update include/z64.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* suggestions
* fix mistake in pausectx
* typo
* door context
* renames
* all nb removed
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* fix kanfont, new docs
* format files, merge master
* fix typo in linker script
* extract asm properly
* door context rename
* fixes in door context
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/code/z_room.c')
| -rw-r--r-- | src/code/z_room.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_room.c b/src/code/z_room.c index eda1b6e76..08b7c7e95 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -120,8 +120,8 @@ s32 Room_HandleLoadCallbacks(GlobalContext* globalCtx, RoomContext* roomCtx) { if (((globalCtx->sceneNum != SCENE_IKANA) || (roomCtx->currRoom.num != 1)) && (globalCtx->sceneNum != SCENE_IKNINSIDE)) { - globalCtx->kankyoContext.unkC3 = 0xff; - globalCtx->kankyoContext.unkE0 = 0; + globalCtx->envCtx.unk_C3 = 0xff; + globalCtx->envCtx.unk_E0 = 0; } func_800FEAB0(); if (!func_800FE4B8(globalCtx)) { @@ -153,5 +153,5 @@ void func_8012EBF8(GlobalContext* globalCtx, RoomContext* roomCtx) { func_8010A33C(globalCtx, roomCtx->currRoom.num); func_8010A2DC(globalCtx); } - func_801A3CD8(globalCtx->roomContext.currRoom.echo); + func_801A3CD8(globalCtx->roomCtx.currRoom.echo); } |