1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00

ovl_Door_Shutter OK (#413)

* Initial progress

* Some more progress

* Fix merge

* OK

* Small improvements

* Further improvements

* Some documentation, ran formatter

* Small fix

* Several review suggestions

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Further review changes

* Space out declarations, better boolean comparisons

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Some ands to modulos

* Swap condition

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Fix merge, PR suggestions

* review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
Tharo 2020-12-03 21:55:01 +00:00 committed by GitHub
parent 80c803b9ec
commit 26c38834ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 752 additions and 2326 deletions

View file

@ -22,8 +22,8 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) {
flag = 1 << (msg->byte1 & 0x0F);
return ((msg->byte0 & 1) == 1) == ((flag & gSaveContext.eventChkInf[(msg->byte1 & 0xF0) >> 4]) != 0);
case 2:
return ((msg->byte0 & 1) == 1) == ((gSaveContext.inventory.dungeonItems[gSaveContext.mapIndex] &
gBitFlags[msg->byte1 - ITEM_KEY_BOSS]) != 0);
return ((msg->byte0 & 1) == 1) ==
(CHECK_DUNGEON_ITEM(msg->byte1 - ITEM_KEY_BOSS, gSaveContext.mapIndex) != 0);
case 4:
return ((msg->byte0 & 1) == 1) == (msg->byte3 == INV_CONTENT(msg->byte1));
case 6: