alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge in beta changes to pikit mode #4

Open
karafruit wants to merge 36 commits from pikit_mode_merge into pikit_mode
pull from: pikit_mode_merge
merge into: alttpr-gwaa-kiwi:pikit_mode
Conversation 0 Commits 36 Files Changed 50 +1464 -532
karafruit commented 2026-06-06 17:44:28 +00:00
Owner
Copy Link
No description provided.
karafruit added 30 commits 2026-06-06 17:44:29 +00:00
feat: king tomb bonk fix c5aaa07f3e
fix: consistency for dungeon counter settings cc635ddb78
Merge in OWRando fixes (#3) 57591e1ef8 
Reviewed-on: #3
fix: skip key counter with universal keys d0f4651130
Merged in DR v1.5.5 6609253059
Fix buffer sword slash when dashing into water 6fb81c0aa8
Fixed bug with MSU-1 GT2 track not falling back to GT track 37caff7bcf
Fix for Kiki unfollowing after certain entrance transition conditions 9174bbfba5
Merge commit '9174bbfba54f94ff51c149ba5d3f9e754dbf61a1' into codemann_OWMain 031a444a4a
extra keys display b58641ad90
Show level of current loot in HUD 80c0f47b1c
Merge branch 'codemann_OWMain' into beta ec0bb02a53
Update version fbd4efc447
Add setting to cap hud/cave loot d7503ad0f3
Fix map/icon issues 85a4abbe7b
Fix compass toggle check and eastern palace split room a52f0d71fb
Bugfixes 2477918df9
Fix loothud on door rando transitions fd3f7f4513
Fix dungeon indicator not updating on falling into dungeons 2f404873b8
Unify standard escape ammo fills 333159ac53
Fix several foutonFindings: e749b6d6bc 
- Dark Palace -> Palace of Darkness
- show dungeon name for multi keys
- fix IP block drop lock
- HUD improvements
Clean up loot icon room transition handling 05172929a3
NPC icon for NPC requiring item turnin; include standing items in loot 85ea4477d2 
HUD as well
Update crystal indicator icons on HUD 67a1ebb50c
Shift item tiers slightly -> map above compass, small keys in dungeon higher 4168bdbeb6
Fix map/compass icons 6b3a05b9de
Rework map/hud loot icons to be more independent 04196daf5f
Add NYI indicator to map swap mode 9843d72327
Implement checking for what maps can be viewed 3c17ec5d48
Merge branch 'beta' into pikit_mode 440beffc94
karafruit added 1 commit 2026-06-07 06:28:48 +00:00
Minor fixups dc05aca244
karafruit added 4 commits 2026-06-07 18:39:13 +00:00
Minor fixups 66e095306c
Add map time to credits fa8f705bf9
Generic small keys don't despawn from shops 6bf2051bab
Merge branch 'beta' into pikit_mode_merge 88d731cf9b
karafruit added 1 commit 2026-06-08 21:11:56 +00:00
Fix max frame count 079a3ae9a8
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin pikit_mode_merge:pikit_mode_merge
git checkout pikit_mode_merge
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
karafruit
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: alttpr-gwaa-kiwi/alttpr-baserom#4
Delete Branch "pikit_mode_merge"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?