mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-02 18:18:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document Room Type (#1740)

Browse Source 
* roomType

* cleanup
This commit is contained in:
engineer124
2024-11-12 11:46:21 +11:00
committed by GitHub
parent 4337c2a4f2
commit 4663beda1a
13 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_player_lib.c
+2 -2
View File
@@ -631,7 +631,7 @@ void func_80123140(PlayState* play, Player* player) {
IREG(69) = bootRegs[16];
MREG(95) = bootRegs[17];
if (play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_2) {
if (play->roomCtx.curRoom.type == ROOM_TYPE_INDOORS) {
R_RUN_SPEED_LIMIT = 500;
}
@@ -1706,7 +1706,7 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) {
EnvHazardTextTriggerEntry* triggerEntry;
s32 envHazard;
if (play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_HOT) {
if (play->roomCtx.curRoom.environmentType == ROOM_ENV_HOT) {
envHazard = PLAYER_ENV_HAZARD_HOTROOM - 1;
} else if ((player->transformation != PLAYER_FORM_ZORA) && (player->underwaterTimer > 80)) {
envHazard = PLAYER_ENV_HAZARD_UNDERWATER_FREE - 1;