mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-26 14:31:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_parameter: Buttons (part 9) (#1192)

Browse Source 
* import button docs

* cleanup

* sync timer val

* add flag comments

* Update src/code/z_parameter.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_parameter.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_parameter.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* fix merge master

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
engineer124
2023-03-30 20:26:35 +11:00
committed by GitHub
parent 6685a4775e
commit f3c811d298
12 changed files with 1313 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_8012EC80.c
+1 -1
View File
@@ -474,7 +474,7 @@ u16 gSceneIdsPerRegion[REGION_MAX][27] = {
s32 Inventory_GetBtnBItem(PlayState* play) {
if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
return ITEM_NONE;
} else if (gSaveContext.unk_1015 == ITEM_NONE) {
} else if (gSaveContext.bButtonStatus == BTN_DISABLED) {
return ITEM_NONE;
} else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) {
if (play->interfaceCtx.unk_21C != 0) {
src/code/z_parameter.c
+1261 -42
View File
File diff suppressed because it is too large Load Diff
src/code/z_player_lib.c
+3 -3
View File
@@ -2169,15 +2169,15 @@ void Player_DrawBlastMask(PlayState* play, Player* player) {
OPEN_DISPS(play->state.gfxCtx);
if (player->unk_B60 != 0) {
if (player->blastMaskTimer != 0) {
s32 alpha;
gSegments[0xA] = VIRTUAL_TO_PHYSICAL(player->maskObjectSegment);
AnimatedMat_DrawOpa(play, Lib_SegmentedToVirtual(&object_mask_bakuretu_Matanimheader_0011F8));
if (player->unk_B60 < 11) {
alpha = (player->unk_B60 / 10.0f) * 255;
if (player->blastMaskTimer <= 10) {
alpha = (player->blastMaskTimer / 10.0f) * 255;
} else {
alpha = 255;
}
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
+3 -3
View File
@@ -241,9 +241,9 @@ void KaleidoScope_SetCursorVtx(PauseContext* pauseCtx, u16 index, Vtx* vtx) {
pauseCtx->cursorVtx[0].v.ob[1] = vtx[index].v.ob[1];
}
s16 sMagicArrowEffectsR[] = { 255, 100, 255 };
s16 sMagicArrowEffectsG[] = { 0, 100, 255 };
s16 sMagicArrowEffectsB[] = { 0, 255, 100 };
static s16 sMagicArrowEffectsR[] = { 255, 100, 255 };
static s16 sMagicArrowEffectsG[] = { 0, 100, 255 };
static s16 sMagicArrowEffectsB[] = { 0, 255, 100 };
void KaleidoScope_DrawItemSelect(PlayState* play) {
PauseContext* pauseCtx = &play->pauseCtx;
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
+2 -2
View File
@@ -528,7 +528,7 @@ void KaleidoScope_UpdateOpening(PlayState* play) {
if (pauseCtx->switchPageTimer == 64) {
// Finished opening
func_80112C0C(play, 1);
Interface_UpdateButtonsAlt(play, 1);
if (pauseCtx->cursorSpecialPos == 0) {
gSaveContext.buttonStatus[EQUIP_SLOT_B] = D_801C6A98[pauseCtx->pageIndex][0];
@@ -1340,7 +1340,7 @@ void KaleidoScope_Update(PlayState* play) {
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = sUnpausedButtonStatus[EQUIP_SLOT_C_RIGHT];
gSaveContext.buttonStatus[EQUIP_SLOT_A] = sUnpausedButtonStatus[EQUIP_SLOT_A];
func_80110038(play);
Interface_UpdateButtonsPart2(play);
gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE;
Interface_SetHudVisibility(HUD_VISIBILITY_ALL);
MsgEvent_SendNullTask();