mirror of
https://github.com/Zelda64Recomp/Zelda64Recomp.git
synced 2025-10-30 08:03:03 +00:00
Add built-in dpad mod, add remaining event calls to input.c
This commit is contained in:
parent
f2901d73bc
commit
0ae2f08828
4 changed files with 6 additions and 5 deletions
1
mods/.gitignore
vendored
1
mods/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
||||||
*.nrm
|
|
||||||
BIN
mods/mm_recomp_dpad_builtin.nrm
Normal file
BIN
mods/mm_recomp_dpad_builtin.nrm
Normal file
Binary file not shown.
|
|
@ -788,6 +788,7 @@ RECOMP_PATCH void Interface_UpdateButtonsPart2(PlayState* play) {
|
||||||
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
|
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
|
||||||
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
|
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
|
||||||
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
|
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
|
||||||
|
recomp_set_extra_item_slot_statuses(play, BTN_DISABLED);
|
||||||
}
|
}
|
||||||
} else if (!gSaveContext.save.saveInfo.playerData.isMagicAcquired && (CUR_FORM == PLAYER_FORM_DEKU) &&
|
} else if (!gSaveContext.save.saveInfo.playerData.isMagicAcquired && (CUR_FORM == PLAYER_FORM_DEKU) &&
|
||||||
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_DEKU_NUT)) {
|
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_DEKU_NUT)) {
|
||||||
|
|
@ -885,6 +886,7 @@ RECOMP_PATCH void Interface_UpdateButtonsPart2(PlayState* play) {
|
||||||
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
|
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
|
||||||
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
|
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
|
||||||
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
|
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
|
||||||
|
recomp_set_extra_item_slot_statuses(play, BTN_DISABLED);
|
||||||
restoreHudVisibility = true;
|
restoreHudVisibility = true;
|
||||||
Interface_SetHudVisibility(HUD_VISIBILITY_ALL);
|
Interface_SetHudVisibility(HUD_VISIBILITY_ALL);
|
||||||
}
|
}
|
||||||
|
|
@ -1092,7 +1094,7 @@ RECOMP_PATCH void Interface_UpdateButtonsPart2(PlayState* play) {
|
||||||
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
|
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
|
||||||
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
|
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
|
||||||
|
|
||||||
if ((gSaveContext.buttonStatus[i] == BTN_ENABLED)) {
|
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
|
||||||
restoreHudVisibility = true;
|
restoreHudVisibility = true;
|
||||||
gSaveContext.buttonStatus[i] = BTN_DISABLED;
|
gSaveContext.buttonStatus[i] = BTN_DISABLED;
|
||||||
}
|
}
|
||||||
|
|
@ -1107,7 +1109,7 @@ RECOMP_PATCH void Interface_UpdateButtonsPart2(PlayState* play) {
|
||||||
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
|
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
|
||||||
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
|
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
|
||||||
|
|
||||||
if ((gSaveContext.buttonStatus[i] == BTN_DISABLED)) {
|
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
|
||||||
restoreHudVisibility = true;
|
restoreHudVisibility = true;
|
||||||
gSaveContext.buttonStatus[i] = BTN_ENABLED;
|
gSaveContext.buttonStatus[i] = BTN_ENABLED;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
#include "../../patches/sound.h"
|
#include "../../patches/sound.h"
|
||||||
#include "../../patches/misc_funcs.h"
|
#include "../../patches/misc_funcs.h"
|
||||||
|
|
||||||
#include "mods/mm_recomp_draw_distance.h"
|
#include "mods/mm_recomp_dpad_builtin.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
@ -619,7 +619,7 @@ int main(int argc, char** argv) {
|
||||||
recomp::register_game(game);
|
recomp::register_game(game);
|
||||||
}
|
}
|
||||||
|
|
||||||
recomp::mods::register_embedded_mod("mm_recomp_draw_distance", { (const uint8_t*)(mm_recomp_draw_distance), std::size(mm_recomp_draw_distance)});
|
recomp::mods::register_embedded_mod("mm_recomp_dpad_builtin", { (const uint8_t*)(mm_recomp_dpad_builtin), std::size(mm_recomp_dpad_builtin)});
|
||||||
|
|
||||||
REGISTER_FUNC(recomp_get_window_resolution);
|
REGISTER_FUNC(recomp_get_window_resolution);
|
||||||
REGISTER_FUNC(recomp_get_target_aspect_ratio);
|
REGISTER_FUNC(recomp_get_target_aspect_ratio);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue