mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-21 08:55:04 -05:00
Code Issues Projects Releases Wiki Activity

learning how to VB (#4563)

Browse Source
This commit is contained in:
Pepper0ni 2024-11-20 01:46:44 +00:00 committed by GitHub
parent 01719283b3
commit f0e5b9c22b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
View File

@ -5091,16 +5091,14 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
if (sLinkAge == LINK_AGE_CHILD) { // 9 lbs if (sLinkAge == LINK_AGE_CHILD) { // 9 lbs
//if we should give the main prize AND it's not rando //if we should give the main prize AND it's not rando
if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, false, &fishData)){ if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, (sFishingRecordLength >= 50.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD), &fishData)){
//((sFishingRecordLength >= 50.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD)) {
HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD; HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
getItemId = GI_HEART_PIECE; getItemId = GI_HEART_PIECE;
sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1; sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
} }
} else { // 13 lbs } else { // 13 lbs
//if we should give the main prize AND it's not rando //if we should give the main prize AND it's not rando
if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, false, &fishData)){ if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, (sFishingRecordLength >= 60.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT), &fishData)){
//(sFishingRecordLength >= 60.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT)) {
HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT; HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT;
getItemId = GI_SCALE_GOLDEN; getItemId = GI_SCALE_GOLDEN;
sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1; sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;