mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 19:13:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert merged conditionals, I guess

Browse source
This commit is contained in:
JordanLongstaff 2024-12-09 17:23:53 -05:00
parent deb8d8f3e7
commit b6ba9cba3c
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -398,12 +398,10 @@ u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
return 0x3043; return 0x3043;
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
return 0x3027; return 0x3027;
} else if (GET_EVENTCHKINF(EVENTCHKINF_DESTROYED_DODONGOS_CAVERN_BOULDER)) {
return 0x3021;
} else if (GET_INFTABLE(INFTABLE_TALKED_TO_DODONGOS_CAVERN_ENTRANCE_GORON)) {
return 0x302A;
} else { } else {
return 0x3008; return GET_EVENTCHKINF(EVENTCHKINF_DESTROYED_DODONGOS_CAVERN_BOULDER) ? 0x3021
: GET_INFTABLE(INFTABLE_TALKED_TO_DODONGOS_CAVERN_ENTRANCE_GORON) ? 0x302A
: 0x3008;
} }
} }
@ -465,14 +463,11 @@ u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
return 0x3043; return 0x3043;
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
return 0x3027; return 0x3027;
} else if (CUR_UPG_VALUE(UPG_STRENGTH) != 0) {
return 0x302C;
} else if (!Flags_GetSwitch(play, 0x1B)) {
return 0x3017;
} else if (GET_INFTABLE(INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON)) {
return 0x3019;
} else { } else {
return 0x3018; return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
: !Flags_GetSwitch(play, 0x1B) ? 0x3017
: GET_INFTABLE(INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON) ? 0x3019
: 0x3018;
} }
} }