diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-03-23 09:36:09 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 09:36:09 +1100 |
| commit | 2cb01b5b6a69635f7c8f554cf97442268aff28be (patch) | |
| tree | a0603a4c4827fb4068d806d11638c1503c356650 /src/code/z_player_lib.c | |
| parent | 9bb978527f619abbedbc5119fa2811385b29c01e (diff) | |
z_room (1 non-matching) (#1143)
* begin room docs and decomp
* match Room_DrawImageSingle
* match Room_DrawImageMulti
* Room_AllocateAndLoad non-matching
* big improvements on Room_DrawCullable
* match Room_AllocateAndLoad
* improvement?
* cleanup
* comments
* cleanup
* small pr suggestions
* PR Suggestions
* cleanup sceneCmds
* some PR
* PR Suggestions
* more PR Suggestions
* col to collision
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 4bdd22e0a..6e7d0222c 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -441,7 +441,7 @@ void func_80123140(PlayState* play, Player* player) { IREG(69) = bootRegs[16]; MREG(95) = bootRegs[17]; - if (play->roomCtx.curRoom.unk3 == 2) { + if (play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_2) { R_RUN_SPEED_LIMIT = 500; } @@ -1456,7 +1456,7 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) { EnvHazardTextTriggerEntry* triggerEntry; s32 envHazard; - if (play->roomCtx.curRoom.unk2 == 3) { // Room is hot + if (play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_HOT) { envHazard = PLAYER_ENV_HAZARD_HOTROOM - 1; } else if ((player->transformation != PLAYER_FORM_ZORA) && (player->underwaterTimer > 80)) { envHazard = PLAYER_ENV_HAZARD_UNDERWATER_FREE - 1; |