mirror of
https://github.com/zeldaret/oot.git
synced 2025-05-10 02:54:24 +00:00
Fix Jenkins errors, round 2
This commit is contained in:
parent
b6ba9cba3c
commit
ce238ea868
1 changed files with 7 additions and 7 deletions
|
@ -399,9 +399,9 @@ u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
|
||||||
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
|
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
|
||||||
return 0x3027;
|
return 0x3027;
|
||||||
} else {
|
} else {
|
||||||
return GET_EVENTCHKINF(EVENTCHKINF_DESTROYED_DODONGOS_CAVERN_BOULDER) ? 0x3021
|
return GET_EVENTCHKINF(EVENTCHKINF_DESTROYED_DODONGOS_CAVERN_BOULDER) ? 0x3021
|
||||||
: GET_INFTABLE(INFTABLE_TALKED_TO_DODONGOS_CAVERN_ENTRANCE_GORON) ? 0x302A
|
: GET_INFTABLE(INFTABLE_TALKED_TO_DODONGOS_CAVERN_ENTRANCE_GORON) ? 0x302A
|
||||||
: 0x3008;
|
: 0x3008;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -464,10 +464,10 @@ u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
|
||||||
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
|
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
|
||||||
return 0x3027;
|
return 0x3027;
|
||||||
} else {
|
} else {
|
||||||
return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
|
return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
|
||||||
: !Flags_GetSwitch(play, 0x1B) ? 0x3017
|
: !Flags_GetSwitch(play, 0x1B) ? 0x3017
|
||||||
: GET_INFTABLE(INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON) ? 0x3019
|
: GET_INFTABLE(INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON) ? 0x3019
|
||||||
: 0x3018;
|
: 0x3018;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue