Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix pitfalling while permabunny bugs (#126) #187

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix pitfalling while permabunny bugs (#126) #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f021a9a
fix pitfalling while permabunny bugs (#126)
FitzRoyX Nov 23, 2022
f749f4f
Update player.c
FitzRoyX Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions player.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,11 +1486,14 @@ void LinkState_Pits() { // 8792d3

// Initiate fall down
if (player_near_pit_state != 2) {
if (link_item_moon_pearl) {
//bugfix: falling as bunny does not restore link for falling animation, part 1 of 2
if (link_item_moon_pearl || (enhanced_features0 & kFeatures0_MiscBugFixes && (link_is_bunny || link_is_bunny_mirror))) {
link_need_for_poof_for_transform = 0;
link_is_bunny = 0;
link_is_bunny_mirror = 0;
link_timer_tempbunny = 0;
if (enhanced_features0 & kFeatures0_MiscBugFixes)
LoadActualGearPalettes();
}
link_direction = 0;
player_near_pit_state = 2;
Expand Down Expand Up @@ -1630,7 +1633,17 @@ void HandleDungeonLandingFromPit() { // 879520
link_grabbing_wall = 0;
link_speed_setting = 0;
} else {
link_player_handler_state = (tiledetect_pit_tile & 0xf) ? kPlayerState_FallingIntoHole : kPlayerState_Ground;
//bugfix: falling from a hole or wallmaster as permabunny restores abilities
if (tiledetect_pit_tile & 0xf) {
link_player_handler_state = kPlayerState_FallingIntoHole;
} else if ((enhanced_features0 & kFeatures0_MiscBugFixes) && (!link_item_moon_pearl && savegame_is_darkworld)) {
link_player_handler_state = kPlayerState_PermaBunny;
link_is_bunny = 1;
link_is_bunny_mirror = 1;
LoadGearPalettes_bunny();
} else {
link_player_handler_state = kPlayerState_Ground;
}
}
}

Expand Down Expand Up @@ -1781,8 +1794,15 @@ void Link_ResetSwimmingState() { // 87983a

void Link_ResetStateAfterDamagingPit() { // 87984b
Link_ResetSwimmingState();
link_player_handler_state = link_is_bunny && !link_item_moon_pearl ?
kPlayerState_PermaBunny : kPlayerState_Ground;
//bugfix: falling as bunny has no falling animation, part 2 of 2
if (enhanced_features0 & kFeatures0_MiscBugFixes && (!link_item_moon_pearl && savegame_is_darkworld)) {
link_player_handler_state = kPlayerState_PermaBunny;
link_is_bunny = 1;
link_is_bunny_mirror = 1;
LoadGearPalettes_bunny();
} else {
link_player_handler_state = link_is_bunny && !link_item_moon_pearl ? kPlayerState_PermaBunny : kPlayerState_Ground;
}
link_direction_last = link_some_direction_bits;
link_is_in_deep_water = 0;
link_disable_sprite_damage = 0;
Expand Down Expand Up @@ -6274,8 +6294,11 @@ void Link_ResetProperties_A() { // 87f1a3
link_is_transforming = 0;
countdown_for_blink = 0;
ancilla_arr24[0] = 0;
link_is_bunny = 0;
link_is_bunny_mirror = 0;
//bugfix: bunny flags were getting cleared without checking permabunny state
if (!(enhanced_features0 & kFeatures0_MiscBugFixes)) {
link_is_bunny = 0;
link_is_bunny_mirror = 0;
}
BYTE(link_timer_tempbunny) = 0;
link_need_for_poof_for_transform = 0;
is_archer_or_shovel_game = 0;
Expand Down Expand Up @@ -6565,7 +6588,8 @@ void ResetSomeThingsAfterDeath(uint8 a) { // 8bffbf
draw_water_ripples_or_grass = 0;
byte_7E0316 = 0;
countdown_for_blink = 0;
link_player_handler_state = 0;
//bugfix: player state was getting reset after death even as permabunny
link_player_handler_state = (enhanced_features0 & kFeatures0_MiscBugFixes && (!link_item_moon_pearl && savegame_is_darkworld)) ? 23 : 0;
link_visibility_status = 0;
Ancilla_TerminateSelectInteractives(0);
Link_ResetProperties_A();
Expand Down