diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2020-04-16 23:36:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 17:36:12 -0400 |
| commit | 262f6c507ca59c75df52e23f93c701705ee22798 (patch) | |
| tree | 179e55b3d59e02d624615b0d4d88867600cca9ed /src/code/z_elf_message.c | |
| parent | 9ac1f8130ddbfdf394e11710021150f6c192fdcd (diff) | |
Decompile z_play.c and Match/Document some of z_view.c (#74)
* Decompile z_play.c and Match/Document some of z_view.c
Also fix the last non matching in z_sample.c and update some game state functions.
* Suggestions from PR #74
* Fix undefined reference to Gameplay_DrawOverlay
* Suggestion from PR #74 (2)
* Fix a fake argument in func_800BC450
Diffstat (limited to 'src/code/z_elf_message.c')
| -rw-r--r-- | src/code/z_elf_message.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index ad7ae66c6..e37756c6d 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -22,10 +22,10 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { switch (msg->byte0 & 0x1E) { case 0: temp = 1 << (msg->byte1 & 0x0F); - return ((msg->byte0 & 1) == 1) == !!(gSaveContext.event_chk_inf[(msg->byte1 & 0xF0) >> 4] & temp); + return ((msg->byte0 & 1) == 1) == !!(gSaveContext.eventChkInf[(msg->byte1 & 0xF0) >> 4] & temp); case 2: return ((msg->byte0 & 1) == 1) == - !!(gBitFlags[msg->byte1 - ITEM_KEY_BOSS] & gSaveContext.dungeon_items[gSaveContext.dungeon_index]); + !!(gBitFlags[msg->byte1 - ITEM_KEY_BOSS] & gSaveContext.dungeonItems[gSaveContext.dungeonIndex]); case 4: return ((msg->byte0 & 1) == 1) == (msg->byte3 == INV_CONTENT(msg->byte1)); case 6: @@ -38,12 +38,12 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { gSaveContext.equipment); case 0x20: return ((msg->byte0 & 1) == 1) == - !!(gBitFlags[msg->byte3 - ITEM_SONG_MINUET + 6] & gSaveContext.quest_items); + !!(CHECK_QUEST_ITEM(msg->byte3 - ITEM_SONG_MINUET + QUEST_SONG_MINUET)); case 0x30: return ((msg->byte0 & 1) == 1) == - !!(gBitFlags[msg->byte3 - ITEM_MEDALLION_FOREST] & gSaveContext.quest_items); + !!(CHECK_QUEST_ITEM(msg->byte3 - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST)); case 0x40: - return ((msg->byte0 & 1) == 1) == !!gSaveContext.magic_acquired; + return ((msg->byte0 & 1) == 1) == !!gSaveContext.magicAcquired; } } |