Skip to content

Commit 7abb7b0

Browse files
committed
Windfall Pedestals Fix
- Fix bug that let you get Sam's item without decorating the Windfall pedestals if you got the delivery bag on Windfall Bug reported at LagoLunatic/wwrando#421 , went with a different fix here/did not reference their code
1 parent d57202f commit 7abb7b0

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

asm/patch_diffs/flexible_item_locations_diff.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Data:
88
0x20D0AE4: [0x88, 0x9F, 0x00, 0xB2]
99
0x20D0AF0: [0x39, 0x00, 0x00, 0x01]
1010
0x21031F0: [0x38, 0xC0, 0x00, 0x00]
11+
0x2116328: [0x60, 0x00, 0x00, 0x00]
1112
0x212456C: [0x88, 0x8C, 0x00, 0xB0]
1213
0x2124578: [0x38, 0xE0, 0x00, 0x00]
1314
0x2124580: [0x39, 0x00, 0x00, 0x00]

asm/patches/flexible_item_locations.asm

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,3 +1007,13 @@ create_stone_head_use_original_id:
10071007
; Remove this check so that you can always cut it down with other items
10081008
.org 0x021A5940
10091009
nop ; Always take the branch for having the boomerang
1010+
1011+
1012+
; To determine if you have decorated the pedestals around Windfall, Sam's actor first checks if you have the delivery bag
1013+
; It then checks if the number of decorated pedestals is equal to the total number of pedestals
1014+
; However, the pedestals do not appear until you have the delivery bag, which leaves the total count at 0
1015+
; If you get the delivery bag on Windfall, Sam's first check will pass, but the pedestals still weren't created
1016+
; Until you reload the island, his second check will also incorrectly pass (because 0 == 0) without decorating the island
1017+
; Always create the pedestals to avoid this
1018+
.org 0x02116328 ; in daDai_c::_create
1019+
nop ; always continue as though you have the delivery bag

0 commit comments

Comments
 (0)