diff options
| author | Random <28494085+Random06457@users.noreply.github.com> | 2020-10-11 19:45:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-11 13:45:08 -0400 |
| commit | b010db7c19207f0e607d5ccaf0d1f2350dda3964 (patch) | |
| tree | 12dc8d3a3dfb57705ba907dd0af855662ed35bde /src/code/z_elf_message.c | |
| parent | 9d3554220793d515230844f894ede66100bdc039 (diff) | |
Decompile z_sram.c (#431)
* Decompile z_sram.c
* rename Sram_CalcChecksum to Sram_WriteSaveSlot
* progress
* done i think
* add original name comments
* temp substructs
* minor fixes
* review
* review 2
* fix
Co-authored-by: fig <fig02srl@gmail.com>
Diffstat (limited to 'src/code/z_elf_message.c')
| -rw-r--r-- | src/code/z_elf_message.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index d3552c419..6db1527b1 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -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.dungeonItems[gSaveContext.mapIndex] & gBitFlags[msg->byte1 - ITEM_KEY_BOSS]) != 0); + return ((msg->byte0 & 1) == 1) == ((gSaveContext.inventory.dungeonItems[gSaveContext.mapIndex] & + gBitFlags[msg->byte1 - ITEM_KEY_BOSS]) != 0); case 4: return ((msg->byte0 & 1) == 1) == (msg->byte3 == INV_CONTENT(msg->byte1)); case 6: @@ -33,7 +33,7 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { case 0x10: return ((msg->byte0 & 1) == 1) == (((gBitFlags[msg->byte3 - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]) & - gSaveContext.equipment) != 0); + gSaveContext.inventory.equipment) != 0); case 0x20: return ((msg->byte0 & 1) == 1) == ((CHECK_QUEST_ITEM(msg->byte3 - ITEM_SONG_MINUET + QUEST_SONG_MINUET)) != 0); |