mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-27 01:55:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_parameter: Hud Visibility (#942)

Browse Source 
* Begin interface alpha docs

* More Interface Alpha

* cleanup docs

* Minor fixes

* Apply Discord Discussions

* More discussions

* More suggestions from OoT

* fix merge
This commit is contained in:
engineer124
2022-09-28 18:47:46 -04:00
committed by GitHub
parent 91d4e29dfa
commit 5e860dd3e7
53 changed files with 960 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_player_lib.c
+11 -8
View File
@@ -389,7 +389,7 @@ void func_80123140(PlayState* play, Player* player) {
IREG(69) = bootRegs[16];
MREG(95) = bootRegs[17];
if (play->roomCtx.currRoom.unk3 == 2) {
if (play->roomCtx.curRoom.unk3 == 2) {
R_RUN_SPEED_LIMIT = 500;
}
@@ -508,20 +508,23 @@ s32 func_8012364C(PlayState* play, Player* player, s32 arg2) {
if (arg2 == 1) {
return (gSaveContext.buttonStatus[1] != BTN_DISABLED)
? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_LEFT]
: (gSaveContext.unk_3F22 == 0x10) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_LEFT]
: ITEM_NONE;
: (gSaveContext.hudVisibility == HUD_VISIBILITY_A_B_C)
? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_LEFT]
: ITEM_NONE;
}
if (arg2 == 2) {
return (gSaveContext.buttonStatus[2] != BTN_DISABLED)
? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_DOWN]
: (gSaveContext.unk_3F22 == 0x10) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_DOWN]
: ITEM_NONE;
: (gSaveContext.hudVisibility == HUD_VISIBILITY_A_B_C)
? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_DOWN]
: ITEM_NONE;
}
return (gSaveContext.buttonStatus[3] != BTN_DISABLED) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_RIGHT]
: (gSaveContext.unk_3F22 == 0x10) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_RIGHT]
: ITEM_NONE;
: (gSaveContext.hudVisibility == HUD_VISIBILITY_A_B_C)
? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_RIGHT]
: ITEM_NONE;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80123810.s")
@@ -865,7 +868,7 @@ s32 func_801242DC(PlayState* play) {
TextTriggerEntry* triggerEntry;
s32 envIndex;
if (play->roomCtx.currRoom.unk2 == 3) { // Room is hot
if (play->roomCtx.curRoom.unk2 == 3) { // Room is hot
envIndex = 0;
} else if ((player->transformation != PLAYER_FORM_ZORA) && (player->unk_AD8 > 80)) {
envIndex = 3;